Fixed small things
Merge branch 'master' of https://github.com/cmusv/Fall-2013-96821-NaVi