Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/SonarManip2014.py
Merge branch 'vehicle_refactor_2014' of https://github.com/robotics-at-maryland/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/SonarManip2014.py
	packages/python/ram/ai/new/sonarNavigation.py
Fixed a few problems with Bins, typo in Task.
Merge branch 'vehicle_refactor_2014' of https://github.com/robotics-at-maryland/tortuga into vehicle_refactor_2014
stuffa
Merge remote-tracking branch 'mainRepo/vehicle_refactor_2014' into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/approach.py
	packages/python/ram/ai/new/utilStates.py
fixes to various sonar code
small fix
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
Modifactions during semi-final practice.
Added config files from semi-final practice run.
Changes before last ditch run.