small changes from lab machine, need to merge back to master branch
Merge branch 'master' of https://github.com/Philip-Bachman/NN-Python

merging non-conflicting changes from home/lab weekend work