had to edit this JS file to get the trails show page working again
tried to turn off deprecation warnings in tests, nothing actually changed
cleaned up formatting in integration_spec.rb
11 tests for trail page spec passing
committing so I can pull and re-rack the DB
committing minor changes in order to switch to master
removed merge conflict for adding marker information back to map
Merge pull request #89 from bobolinks-2014/fixing-trail-page-spec

Fixing trail page spec