Clean up .travis.yml

This patch cleans up .travis.yml, adds comments to explain some steps
and adds an additional playbook run for testing idempotency.