install simplecov

fix elasticsearch on heroku Merge branch 'staging'

configuration for searchbox heroku plugin

change production and staging app names

fixed advanced search in nav

fix 2 failing feature specs

fix failing feature test

fix carrierwave initializer

fixed another error in circle.yml

reset staging to week_eight_1 branch

Merge pull request #13 from tommotaylor/revert-12-master

Revert "Fixing git issues"

Merge pull request #12 from tommotaylor/master

Merge branch 'master' of https://github.com/tommotaylor/myflix

Merge branch 'week_eight_1'