Merge branch 'hotfix/oauth'
Merge branch 'dev'
Merge pull request #105 from codeflash/dev

Like a boss
Remove all trailing whitespace
Fix an indentation issue
In partials, replace instance variables with local variables
Speed up assets precompile with turbo-sprockets-rails3 gem
Various syntax refactoring with rendering and model queries
Organize class and instance method definitions within User
Merge pull request #114 from codeflash/dev

Dev
Remove empty helpers
turned on rememberable. fixed #93
Fix Law of Demeter violations with ActiveRecord's delegate method
Add a brief comment on User.new_with_session
Merge branch 'dev' into feature/qa

Conflicts:
	app/models/user.rb
	app/views/profiles/_form.html.erb
	config/routes.rb
Fix users and solutions not getting passed as partial locals
Remove trailing whitespace
Remove an instance variable in a partial that I forgot to get rid of
Use save! and create! instead of save and create (to prevent silent failures)
Merge branch 'dev'