updates on lab machine, to merge with laptop changes
Merge branch 'master' of https://github.com/Philip-Bachman/NN-Python