removed binding pry from google auth
took out a binding pry in text, fixed email address in config
Merge branch 'master' into heroku_fix
changed local photos controller
changed photo uploader methods