Took out -std=c++11 for non OSX platforms
Merge branch 'david-patch-2' of github.com:rhyolight/nupic into david-patch-2