Merge pull request #1519 from oxtopus/cmake-cleanup

Refactored CMakeLists.txt to use nupic.core as an external library
Merge remote-tracking branch 'upstream/master' into vagrant-coreos-docker