niko stuff
Merge branch 'master' of github.com:sashafklein/planit

* 'master' of github.com:sashafklein/planit:
  Created a semi-functional leg-map directive

Conflicts:
	app/views/itineraries/show.html.haml