Merge pull request #15 from tjahnk/nbproject-cleanup