init
Merge branch 'master' of github.com:koansys/drupal-ansible

Conflicts:
	.gitignore
Fixing merge...
Delete ansible.hosts-default
Merge branch 'master' into cs/docs