Merge pull request #4 from ambertunnell/ben_branch

Flickr pictures now change to the correct location
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Adds omniauth, modifies tweet, user, photo, article relationships'