Ensure /etc/elasticsearch is a dependency of the various config files

- also tidy up salt style