modified foursquare api data to pull tips and venue names
fixed users controller merge problems
Merge pull request #40 from Noahhh/master

fixed users controller merge problems
Merge pull request #39 from dheckman/master

modified foursquare api data to pull tips and venue names
fixed issues with login/logout
Merge pull request #41 from dheckman/master

fixed issues with login/logout