Making the tour page, lightboxed.
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/pages/tour.html.erb
correctly running