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
Added mouseover functionality for map marker pins with posts
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
Merge conflict
Fix typo in function call names after refactoring function def names
Merge pull request #147 from spring-peepers-2014/fix/update-location-list-and-pins-on-trip-view

Fix typo in function call names after refactoring function def names
User can now add a post without having to re-enter the location

- on the posts/new form
Merge pull request #148 from nealfennimore/featureenhancement/now-user-does-not-have-to-reenter-location-for-their-post

Feature-enhancement: now user does not have to reenter location for their post
Reverted map controller back - tests were accidently pushed
Merge pull request #149 from nealfennimore/fix/map-controller-js-revert

Reverted map controller back - tests were accidently pushed
Changed button to say Back to Map, and btn primary class
Changed button to say Back to Map, and btn primary class
Added a:hover to not do text underline
Made modal partial for new post creation:

- Show has btn-primary class now
Merge pull request #150 from nealfennimore/fix/modals-partials-styles-create-posts

Fix/modals partials styles create posts
now the black sidebar extends further down the page

- This is good because it doesn't stop suddenly and then turn white when you add trips
- This is bad because it means you can scroll down to an area where there isn't anything, if you have less locations pinned