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

Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion

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

Unfortunately, we can't put ruby-debug in the gemfile because it breaks 1.9.2 compatibility.  Just put it back in locally when you want to use it, or figure out how to do a switch by ruby verison in the Gemfile

MS DG made async webfingering controller.  need to call it from javascript to prevent seeds from blocking.  remember to update your gems