caffe.cpp code formatting
Normalization, small fixes, scaling