Merge pull request #3 from femmestem/chore/build_test

Add database yml for Travis to check build w pend/fail Rspec tests
Merge branch 'master' of https://github.com/femmestem/TravelBlog
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Add locations routes

Nest locations routes under trips.
Nest posts routes under locations instead of trips.
Add photos routes nested under locations.
Remove extraneous routes

Locations only have index, show, create, destroy.
Posts have full CRUD shallow nested under locations.
Photos only have create and delete.
Merge branch 'chore/routes' of https://github.com/spring-peepers-2014/TravelBlog
Merge pull request #65 from nealfennimore/bug/navbar

Bug/navbar
When you click a Trip on sidebar...

- You can now see the pins (NOT AJAXed)
- You can see the locations and blog posts for that trip in the sidebar
Merge pull request #66 from Lrmanfre/feature/see-pins-and-blog-posts

Feature/see pins and blog posts
Fixed merge conflict on routes
Merge branch 'chores/load_pin.js' of https://github.com/nealfennimore/TravelBlog into chores/load_pin.js