DRY-ed up some user controller stuff
fixed error with nav when you weren't already logged in
Merge remote-tracking branch 'origin/master' into foursquare-rails-wrapper