Merge branch 'vehicle_refactor_2013' of https://github.com/rajaths/tortuga into vehicle_refactor_2014

Conflicts:
	buildfiles/cmake/modules/FindOpenCV.cmake
Fixed an error with lcdshow that hard coded the dev of the sensor board
Merge branch 'vehicle_refactor_2014' of https://github.com/mxlan/tortuga into vehicle_refactor_2014
Merge branch 'vehicle_refactor_2014' of https://github.com/robotics-at-maryland/tortuga into vehicle_refactor_2014
Merge branch 'vehicle_refactor_2014' of https://github.com/robotics-at-maryland/tortuga into vehicle_refactor_2014
otstrap push to tortugaRam
Fixes to lcdshow, things work!!1
Merge branch 'vehicle_refactor_2014' of https://github.com/tortugaRAM/tortuga into vehicle_refactor_2014
fixes to boottstrap
Merge branch 'vehicle_refactor_2014' of https://github.com/mxlan/tortuga into vehicle_refactor_2014

Conflicts:
	bootstrap.py
Merge branch 'vehicle_refactor_2014' of https://github.com/erudnick-cohen/tortuga into vehicle_refactor_2014
Merge remote-tracking branch 'schristian/vehicle_refactor_2014' into vehicle_refactor_2014
Merge remote-tracking branch 'eliot/vehicle_refactor_2014' into vehicle_refactor_2014
Merge branch 'vehicle_refactor_2014' of https://github.com/mxlan/tortuga into vehicle_refactor_2014
Merge branch 'vehicle_refactor_2014' of https://github.com/rajaths/tortuga into vehicle_refactor_2014

Conflicts:
	buildfiles/cmake/modules/FindOpenCV.cmake
Fixed small merge conflict in utilStates.py
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