Fix mapper bugs
Merge branch 'dev' of github.com:yaleigvc/IGVC2014 into dev