Merge branch 'master' of github.com:matrix-org/synapse into develop
Added a param (--no-rate-limit) to demo/start.sh to disable the HS rate limit
Added pylint config file: ignore missing-docstring messages.
Merge branch 'master' into develop
switch from the deprecated msg.content.prev to msg.prev_content.membership, and fix the bug where kicks of unjoined users aren't displayed sensibly in the history
Wrap preparing the database in a transaction. Otherwise it will take many seconds to complete because sqlite will create a transaction per statement
Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC
Fix pyflakes warnings
Test pyflakes jenikns integration
Remove test_pyflakes.
Fix SYWEB-109 : No error if HS rejects the username in registration.

Display all error messages from the server when registering, rather
than just the types of errors the client recognises.
HandleRoomMember: handle correctly prev_content
Implement SYWEB-121 : Display JSON when clicking messages.

JSON is displayed as a modal dialog via AngularJS' bootstrap module,
"ui.bootstrap".
SYWEB-121: Have some bootstrap files.
Don't clobber existing css
Fix SYWEB-114 : Error message when trying to invite a user already in the room.
Remove duplicate join_event from create_room
Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.name
fix mobile CSS layout
Fix SYWEB-128 : Auto-scroll broken if not exactly at bottom of list.

Added a small 10px buffer so if the list isn't quite at the bottom it
still actually scrolls.