probably the same changes
Merge branch 'master' of github.com:rhyolight/nupic-tooling

Conflicts:
	index.js