Merge pull request #6 from JBrianGordon/kellybranch

added has many through relationship
finishes the venues controller tests
fixes the conflict in app/models/venue.rb
Merge pull request #7 from JBrianGordon/jamesbranch

Jamesbranch
working on venues views, added underscore.js
removed routes in attempt to resolve conflict