Initial pass at adding route generation
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/maps.js
	templates/index.html