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
now the location that is appended to the travel list view....

- Links to the correct location
remove empty files
remove draw routes button
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Merge pull request #120 from Lrmanfre/bugfixes/remove-draw-routes-btn-remove-empty-files-send-new-location-link-to-correct-place

Bugfixes/remove draw routes btn remove empty files send new location link to correct place
merge conflict fix
Merge pull request #121 from nealfennimore/master

Merge conflict fix
add logic so only the trips a user created are displayed
remove Add Location button

- Redundant and when clicked, directed a user back to the index
change placeholder text to be more informative
locations now display in reverse order:

- Last created show up at the top, but still need to implement prepending them when creating in the JS
posts now appear in reverse order
fix spelling of Pittsburgh
after posting, direct user to page showing all locations for a trip
add logic to flash message if user attempts to add a location that already exists in that trip

- However, message will not display unless it is checked for on the JS side
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Fixed faulty user tests
- Gave a password limit to Faker password data in User factory
- Refactored User spec to use Factory Girl
- Added test to User spec to test for password min length of 6