Merge pull request #6 from StevensLighthouse/stop-migration

Added stop table to rake migration
travis-ci integration for ruby 1.9.3 and 2.0.0
Merge pull request #7 from StevensLighthouse/travis

travis-ci integration for ruby 1.9.3 and 2.0.0
changed tours to look for nearby tours
added respond_to functionality, created basic view for tour index
Changed travis settings to not email me on success
Merge pull request #10 from StevensLighthouse/travis-email

Changed travis settings to not email me on success
Okay I don't want emails ever
Merge pull request #9 from StevensLighthouse/tour-nearby

changed tours to look for nearby tours
Merge pull request #11 from StevensLighthouse/travis-again

Okay I don't want emails ever
Merge pull request #8 from StevensLighthouse/good-views

Added respond_to functionality, created basic view for tour index
migration for stops_tours join table
Merge pull request #12 from StevensLighthouse/tour-stop-join-table-migration

migration for stops_tours join table
create category table and set up reference between stops and categories
Merge pull request #13 from StevensLighthouse/fix-stop-category-reference

create category table and set up reference between stops and categories
seed data for tours and stops
use has_and_belongs_to_many association between tours-stops and categories-stops
Merge pull request #14 from StevensLighthouse/seed-data

Seed data
Merge branch 'master' into stops-controller