Apply c++11 changes, including consolidated logic for NUPIC_CORE and NUPIC_CORE_SOURCE
Undo changes not part of c++11 change.
Merge pull request #1490 from oxtopus/c++11-clean-history

Apply c++11 changes, including consolidated logic for NUPIC_CORE and NUPIC_CORE_SOURCE