Removed /nbproject (NetBeans project data) and added it to .gitignore.
Consolidated and generally cleaned up files.