Merge pull request #30 from rhyolight/dev-master

Switching travis to start building off dev-master.
Merge pull request #33 from rhyolight/dev-master

Experimenting with auto-merging after build success on dev-master.
Merge branch 'dev-master' of github.com:numenta/nupic into dev-master