change initial migration because no DB's set up
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
Merge branch 'master' of https://github.com/CharlesGust/django-imagr into views_cmg
Photo URL pattern fix, HTML additions
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
automate CI tests with Travis CI
Removed unnecessary reference to albums on photo page
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
Added friends' recent photos stream
Merge branch 'views_bf' of https://github.com/CharlesGust/django-imagr into views_cmg
restore simple customizations to admin pages
Merge pull request #8 from CharlesGust/cleaning_views_bf

Cleaning views bf