Couple of fixes to make this playbook work more reliably.
Merge pull request #4 from clburlison/master

Couple of fixes to make this playbook work more reliably.