Merging fixes made 2 days ago:

 * Documentation fixes
 * config.py fix ('example' room was being removed)
 * Allowing 'make serve' to run on non-standard ip:port for testing