var cleanup

Remove separate roles

Move stuff back into single playbooks

(0) -30 -10 -3 +3 +10 +30 tip

mercurial