Reorganized video devices
Shape match changes
shape match fixes
Merge branch 'master' of https://github.com/OregonStateMarsRover/Rover2014