Merge remote-tracking branch 'origin/master' into development
add activity page linkable through explore page and style it
fix small issue with not redirecting when user enters /activities into the browser
Move Other Macros in customer.rb
Clean up model
Move yelp logic to vendor model
Squash
refactor rspec for models vendor, customer, trip and itinerary items
refactor acitvity and activity_time to use factory girl
Begin creating form for confirm_details
Make yelp module comply with model, clean unnecesary instance method
Fix tests to comply with new linkage
Merge pull request #90 from tuxedio/rspec-refactor

Rspec refactor
Merge remote-tracking branch 'origin/development' into c-refactor-vendor
Small lints
Add assets group to Gemfile, update to Rails 4.0.5
Require assets in development and test
Add spring to speed up tests
Merge pull request #92 from tuxedio/c-gemfile-assets

Add assets group to Gemfile, update to Rails 4.0.5 for security patch, add Spring for faster tests
Fix Gemfile.lock