Updates to a couple of playbooks

A few updates to the common playbook and formatting tweaks to other roles to make them a bit easier to read.
Nothing significant, just trying to make things a bit more Ansible-ly.