Merge pull request #1 from femmestem/chore/build_test

Chore/build test
Merge pull request #2 from femmestem/bug/Travis_gemfile_conflict

Bug/travis gemfile conflict
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Remove auto-generated schema
Resolve gem conflict per Travis test

Remove duplicate 'pry' gem in production, belongs in test/dev only
Merge pull request #13 from spring-peepers-2014/bug/Travis_gemfile_conflict

Bug/travis gemfile conflict