Merge remote-tracking branch 'mainRepo/vehicle_refactor_2014' into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/testing.py
Merge 192.168.10.12:/home/tortuga/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/testing.py
	packages/python/ram/ai/new/utilClasses.py
fixes
torp fixes and preparations
Miscellaneous changes during runs.
Merge branch 'vehicle_refactor_2014' of 192.168.10.12:/home/tortuga/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/testing.py
	packages/vision/src/VisionSystem.cpp
Merge remote-tracking branch 'mainRepo/vehicle_refactor_2014' into vehicle_refactor_2014

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

Conflicts:
	packages/vehicle/src/device/SensorBoard.cpp
Removed testing.py in favor of new configuration system.
fixed torpedo ai again...
Torps test run with config, run set up
pogo motion tets and more testing ai yml files
added config stuff
Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014

Conflicts:
	packages/python/ram/ai/new/mainState.py
	packages/python/ram/ai/new/testing.py
	tools/simulator/data/config/ai/default_state.yml
Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014
Miscellaneous changes from pogo test run.