Merge branch 'master' of https://github.com/miracode/django-imagr
Merge branch 'ui' of https://github.com/miracode/django-imagr into ui
Merge branch 'ui' of https://github.com/miracode/django-imagr into ui
Hacky hacks serving images from s3
Adds an add-photo form to the album page
Adds Create album, makes part of a follower form