fix merge
fix merge
Merge branch 'master' of github.com:ravaa/nupic
Merge branch 'master' of github.com:ravaa/nupic
adds vagrant file
gives vm more memory
Merge branch 'vagrant' of github.com:ravaa/nupic into vagrant