Add JAUS
Merge branch 'dev' of github.com:YaleIGVC/IGVC2014 into dev
Updates map_merger