various fixes based on truphone feedback
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop
suggest ~/.synapse