Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

Conflicts:
      tests/playbook.yml

It looks like you may be committing a merge.
If this is not correct, please remove the file
      .git/MERGE_HEAD
and try again.

- Moved pre_tasks to a seperate play because run_once is currently not
supported with the free strategy.