Merge pull request #3 from saltys/activities

Activities
Add photo to show page
Flickr photo display
Merge branch 'master' of https://github.com/saltys/wanderlist into flickr
Clean up Gemfile
Merge pull request #4 from saltys/flickr

Flickr
Add rails_12factor