Re-apply a0b1b34c71e46304f7024f0570db92f4577303b5 to master (fixing synctl)
Update README setup instructions to be correct. Make synapse spit out explanatory note when generating config to tell people to look at it and customise it.
Merge remote-tracking branch 'origin/master' into develop