stravabuddies pre local pull
Merge branch 'master' of https://github.com/williaster/strava_buddies

Conflicts:
	app/buddies_cached.pyc
	app/views.pyc
add superviord for flask
Merge branch 'master' of https://github.com/williaster/strava_buddies

Conflicts:
	app/views.pyc
add slides, tweak choose activities
Merge branch 'master' of https://github.com/williaster/strava_buddies