DavidRagazzi/nupic — pull request #42 by rhyolight (2014-12-05 16:06:45+00:00)
Title: Manual merge of master

Conflicts were ones I created within setup.py.