Updated map and cleaned up code
Merge branch 'master' of https://github.com/RSD2014-Group-5/FroboMind