Cleanup raft startup
Move things around in the config file for clarity and add comments.