Merge branch 'master' of https://github.com/numenta/nupic.core into issue-69-source-file-renaming

Author: utensil

.gitignore

@@ -1,23 +1,16 @@
 .metadata
 .idea
-*.class
-*.am
-*.in
 *.manifest
 *.cache
 *~
 *.DS_Store
 *.swp
 
-html/
+# IDE project files
+/nbproject/
 
-Servers/
-
-# Build artifacts and .bashrc artifacts
+# Build files
 build/
-build/scripts/
-build/release/
-build/temp/
 
 src/test/testeverything/EverythingAddtests.hpp
 src/test/testeverything/EverythingHeaders.hpp