Moved the actual map object to map.gmaps to allow for enhanced map organization and functionality.
Merge branch 'master' of https://github.com/gears88/YRS2013

Conflicts:
	bikedata/cache.json