Conflicts:
	spec/controllers/aspects_controller_spec.rb

Conflicts:
	spec/models/aspect_spec.rb

Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.

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

This reverts commit c08121e6.

This reverts commit 3faca838.

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

This reverts commit 4bb5aeb3, reversing
changes made to fb70dc8c.

patching websocket_server.rb to provide a pidfile, important
for SystemV init files. Ubuntu upstart configuration. Bugfixes