Remove the generic text from static/index.html.erb
Updated gems
Updated bootstrap-sass
Remove rdoc README
Updated gems
Remove token_authenticatable since it's been removed from Devise
Merge branch 'master' into mailers

Conflicts:
	app/models/user.rb