Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Refactor JS Map model and dependencies

Remove redundant createPin function form Map.
Map.loadTripPins queries location_pins#index for pins instead of trips#show_markers.
Trip view and Trip controller update to handle both http and ajax requests.
Updated routes, removed trips#show_marker.
Refactored JS LocationPin model.
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog

Conflicts:
	app/assets/javascripts/map-model.js
Merge pull request #146 from spring-peepers-2014/chore/refactor-js-map-model

Chore/refactor js map model