update readme
switch to postgresql
Merge branch 'puma' into social.mrzyx.de

Conflicts:
	Gemfile.lock
Merge branch 'daemontools' into social.mrzyx.de