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