Merge remote-tracking branch 'github/master' into dev-master
Merge branch 'dev-master' of github.com:numenta/nupic into dev-master
Merge branch 'dev-master' into travis-unit-tests