cleaned up map tpl code; added MapQuest tiles
Merge branch 'newmap2' into next