Merge branch 'feature/simpler-config' into develop
Removes hard-coded node names from playbook