Re-added secrets.yml missing from previous commits
Merge pull request #109 from nealfennimore/fix/secrets.yml

Re-added secrets.yml missing from previous commits
Fixed spec tests and added location tests:

- Fixed associations around in tests for references to location_pins and locations
- Added new location factory
- Took out long and lat from location_pins and added to location
Merge pull request #110 from nealfennimore/fix/spec_tests

Fixed spec tests and added location tests:
Added OOJS functionality to create pin:

- Moved older JS files to old folder for future reference
- Add map model, controller, and options for map
- Added test to js_location to see if addPin is working
- Changed json object around for LocationPins controller to use lat and longitude
- Changed json render in LP controller to reference locations and not locationspins var
Merge pull request #111 from nealfennimore/feature-fix/added_oojs_to_create_map_and_pins

Added OOJS functionality to create pin:
 Added gem 'rails_12factor' to production for heroku static asset deployment
Merge pull request #112 from nealfennimore/fix/gemfile_asset_heroku

 Added gem 'rails_12factor' to production for heroku static asset deploy...
Added procfile again? for heroku
Merge pull request #113 from nealfennimore/heroku-add-again

Added procfile again? for heroku
Fixed asset pipeline:

- No longer have include tags for each seperate JS file in app/javascripts
- Added javascript include tag for all application files
- Deleted all unused JS files
Merge pull request #114 from nealfennimore/fix/asset-pipeline-old-js-delete

Fixed asset pipeline:
Added path to show_markers method
Changed view files around:

- Removed plus link from trips#index
- Removed previous ajax link click call from trips#show to make more OOJS
- Added script tag to call all pins
Removed comments and test code from map-controller.js
Added new functions:

- Add function to load all pins
- Add generic ajax method
Still soup but adds pin to map
Changed json object:

- Created json format for later on
- Removed nested loop
Merge pull request #115 from nealfennimore/features/map-model-js

Features/map model js
Merge pull request #116 from nealfennimore/soup/js-pin-placement-on-map

Still soup but adds pin to map