get some foursquare stuff
Merge branch 'master' of https://github.com/robhunter/healthystuff

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
clean up some stuff