Merge branch 'hotfix/0.0.3.1'
fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
removes example config file
dont ignore the diaspora config file,
adds diaspora.yml config file
adds the certificate auhorities path to config
adds pg to gemfile
merge conflicts