controller spec
moved api key to config/initializers and ignored it
Merge branch 'master' into heroku
fixed conflicts in the view