cleaned up map tpl code; added MapQuest and OCM tiles
merge map update