Adjustments for Ansible 1.7 - fixes #1