don't make logout a two-step process
Merge branch 'master' of github.com:SmallsLIVE/smallslive
use thumbor for thumbnails
Merge branch 'master' of github.com:SmallsLIVE/smallslive
Merge branch 'master' of github.com:SmallsLIVE/smallslive
resolve merge conflict
fix merge conflict
the bitgravity->s3 script needs pycurl
Merge branch 'master' of github.com:SmallsLIVE/smallslive

Conflicts:
	smallslive/templates/events/event_detail.html