augmentation now shouldnt happen during test, also fixed a couple small bugs
Merge branch 'imagenet-fr-dev' of https://github.com/stokasto/caffe into imagenet-fr-dev