did stuff
Merge branch 'master' of http://github.com/BrainComputationLab/ncb