almost complete
Merge branch 'master' of github.com:lemiwinks/activate.me

Conflicts:
	app/views/bike/index.erb
	app/views/run/index.erb
	app/views/run/show.erb