compsbk file modifications.
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images

Conflicts:
	deepnet/examples/roads_convnet/mass_roads.pbtxt
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images
Timing.
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images

Conflicts:
	deepnet/image_datahandler.py
Normalize differently.
Merge branch 'aerial_images' of https://github.com/mbrubake/deepnet into aerial_images

Conflicts:
	deepnet/examples/roads_convnet/model_conv_mass_roads.pbtxt
	deepnet/image_datahandler.py