stuff
Merge branch 'master' of github.com:dicarlolab/archconvnets
bugfixes to options