Squashed everything from numenta/nupic#364 into nupic.core