Fixes map_merger
Merge branch 'dev' of https://github.com/YaleIGVC/IGVC2014 into dev