xapi.html -> index.html, and sample-config -> config (no reason not to)
Merge branch 'master' into lister