basic 4sq update
fucking with 4sq
Merge branch 'foursquare'

Conflicts:
	app/models/user.rb
	app/views/users/index.html.erb
	config/initializers/foursquare.rb
cleaned up the dbs