temp storage for changes on robot
Merge branch 'vehicle_refactor_2014' of 192.168.10.12:/home/tortuga/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/sonarNavigation.py
Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/acousticOrientation.py