Ran cpplint, fixed rule violations.
Ran cpplint, fixed rule violations.

billhoffman/drake,billhoffman/drake,sheim/drake,billhoffman/drake,billhoffman/drake,billhoffman/drake,sheim/drake,sheim/drake,billhoffman/drake,sheim/drake,sheim/drake,sheim/drake,billhoffman/drake,sheim/drake,sheim/drake,billhoffman/drake