Don't break if the user has deleted their name
Merge branch 'master' into rails3

Conflicts:
	app/controllers/application_controller.rb
Make migrations possible to run on sqlite3