This reverts commit 9cd08bac.

Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb

updated rails, and incorrect respond_to :location calls.  you must supply an object with respond_with

Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.

fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller.

uploaded photos show in the publisher textarea instead of outside and above.  fixed comment textarea on show pages.

publisher collapsed by default on all pages.  removed button styling from add photos button.  publisher only collapses on ajax success.  comment buttons use show() instead of fadeIn().