NOJIRA:  Removing IDE-specific files from the project (per discussion with Anthony)
Merge remote-tracking branch 'upstream/master'