Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014
Added new DiveTo state for absolute depth; Dive now does relative depth.
Merge remote-tracking branch 'schristian/vehicle_refactor_2014' into vehicle_refactor_2014
uprights completed, not tested successful in simulator. Same jsternburg error when running (look at approach and related, error occurs when I succesfully transition into approach)
gate modified to use new *args version of the stateMachine's addTransitions method. ot sure what else was changed
added the opposite of hasQueryBeenFalse
fixed switch, __init__ now has missing self, inheritance correctly calls State instead of state.State
testing.py modified to test uprights
stateMachine modified, addTransitions to take in *args instead of a list structure
ignored files removed from personal git repo
important fix to utility
stuff
fasf
Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014
Merge remote-tracking branch 'mxlan/vehicle_refactor_2014' into vehicle_refactor_2014

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

Conflicts:
	packages/python/ram/ai/new/testing.py
	packages/python/ram/ai/new/utilClasses.py
	packages/python/ram/ai/new/utilStates.py
Fixed more merge conflicts.