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