Add merge
Merge pull request #23 from gregerg/master

add post install script for heroku
add backround images
remove console.log statement
add api keys to git ignore
added keys to gitignore file
Merge pull request #24 from youreddy/flickr

Flickr
alicia these keys
scripts not script
add flickr dependencies
small changes to flickr
add semicolons
fix instagram response in global.js
add flickr keys switch back in
Merge branch 'master' of https://github.com/gregerg/Global-View