Added private method back to trip params
Added sidebar and main column to post views
Merge pull request #72 from Lrmanfre/bugfix/show-new-trip-link-after-submitting-trip

Bugfix/show new trip link after submitting trip
Merge pull request #73 from nealfennimore/chore/posts

Chore/posts
Separate Location from Location Pin

Create Location model and migrations.
Make Location Pin a join between Location and Trip.
Location is named from Geocoder data instead of user input location search term.
Location URI refers to Location Pin controller.
Geocoder configured to lookup Google geocoded data.
Geocoder configured to timeout after 5 seconds instead of 3.
Geocoder configured to cache queries in Rails.cache.
Resolve merge conflict in routes

Remove unused commented code
Merge pull request #74 from femmestem/feature/locations_and_location_pins

Feature/locations and location pins
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into bugfix/show-new-trip-link-after-submitting-trip