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

status message show is now a real show page.  photo partial in stream shouldn't display a slideshow of album.

Conflicts:
	pkg/ubuntu/diaspora-setup

Conflicts:
	spec/models/user/invite_spec.rb