update gems
first pass at profiles
update gems and ruby
merge accounts branch for profiles
update coffee-rails
fix permissions
merge master
merge server
Merge branch 'master' into server