should send the email when a new request is received.  emails in dev should be intercepted to email@joindiaspora.com for now

should send the email when a new request is received.  emails in dev should be intercepted to email@joindiaspora.com for now

This reverts commit 570d0cf1, reversing
changes made to 9da53994.

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

Adds a config file with environment and default thin
options

removed the invites controller test

DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile

Uses the file config/gitversion if git is unavailable.  This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.