Model tweaks.
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images

Conflicts:
	deepnet/examples/roads_convnet/model_conv_mass_roads.pbtxt