Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Update changelong and upgrade
I can't type apparently
Merge pull request #9 from matrix-org/develop

Fix issue with timestamps in webclient
Bunp to change log.
Bump version
Bump the other version
fix timestamps some more
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse
improve changelog slightly
Fix auto generating signing_keys
Add get_json method to 3pid http client. Better logging for errors in 3pid requests
Use https link to download syutil as not everyone has ssh access to github.
use a tagged version of syutil rather than master
Merge branch 'master' of github.com:matrix-org/synapse into develop