Merging in master to "nta" --> "nupic" namespace change