This reverts commit 1481056a.

This reverts commit fb70dc8c, reversing
changes made to 53fef63a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb

T

MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.

added a generate:secret_token task, and added an initializer to generate one if the file does not exist

terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.

updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too