Use correct default, format fix

- Use `consul_data_dir` for `data_dir`
- Match indentation level with `rejoin_after_leave`
Add data dir to directories that get setup.
Merge pull request #1 from benjaminws/fixes-and-cleanup

Fixes and cleanup