Merge pull request #2 from nealfennimore/feature/js-map-model-controller

Feature/js map model controller
Merge pull request #3 from nealfennimore/feature/show-html-load-trip-pin-fix

Feature/show html load trip pin fix
Merge pull request #4 from nealfennimore/test/js_location

Test/js location
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
merge conflict fix
Merge pull request #121 from nealfennimore/master

Merge conflict fix