Updates README to include server conf files documentation.
Merge branch 'master' into init-table