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
Removed belongs_to from photos and posts model
Merge pull request #12 from nealfennimore/chores/remove-belongs-to-from-models

Chores/remove_duplicate_associations_between_trips_and_post/photo_models
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
Added migrations to remove belongs_to references of trips from photos/posts
Added needed jQuery files to app/assets
Merge pull request #14 from spring-peepers-2014/chores/remove_belongs_to_migrations

Added migrations:
Merge pull request #15 from spring-peepers-2014/features/jquery

Added needed jQuery files to app/assets
Added index styling and page
Merge pull request #17 from spring-peepers-2014/features/index_page

Added index styling and page
Add gem lock to speed up Travis CI testing

Un-ignore gem lock file
Remove asset namespace in Gemfile to ensure all dependencies load for test
Added index and new trips views:

- new has form for creation
- index has map canvas and displays all trips
Added trips controller:

- has new, create, and index methods
- create makes a new trip and associates locations pin to trip
Added maps.js with custom blue theme
Removed turbolinks require as file could not be found