Fix token
Move current_trip to customer model
Find and replace names, clean up explore controller
Pass entire activities object to explore
Merge branch 'development' into c-refactor-explore
Thin out explore_without_cart
Clean up customer model
Merge remote-tracking branch 'origin/development' into c-refactor-customer-model
Merge remote-tracking branch 'origin/development' into c-refactor-explore
Merge branch 'c-refactor-customer-model' into c-refactor-explore
Fix @activities bug
Clean up explore views and fix populate bug
Merge pull request #86 from tuxedio/c-refactor-explore

Refactor explore page and current_trip
Merge remote-tracking branch 'origin/master' into development
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