bump rails to 3.2.13, release 0.0.3.4
Merge branch 'hotfix/0.0.3.4'
Merge branch 'master' of git://github.com/diaspora/diaspora into prod

Conflicts:
	Gemfile.lock