Bring Gemfile.lock back
Merge branch 'master' of github.com:diaspora/diaspora into production

Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
Basic 1.9.2 port
Replace require_relative with compatible version
get_to_the_choppa is back
Don't webfinger another server on receiving a webfinger request
Merge branch 'master' of github.com:diaspora/diaspora
Need more stack traces!
And fix some more requires
Put only the hostname in diaspora_handle
Merge branch 'master' of github.com:diaspora/diaspora into production
Add bin directory to gitignore
Warn if can't attach to websocket port
websocket js should honor app socket port configuration
fixed small issue in albums#update anad added corressponding controller test
fixed xss bug in comment view partial.
Added I18n initializer
Merge branch 'master' of http://github.com/diaspora/diaspora into spanish-translation
Added devise spanish locale
initial german translation