Merge branches 'master' and 'master' of github.com:dicarlolab/archconvnets
bugifx in cifar intermediate