Merge branch 'generalise-hacking-dir-path-discovery' of git://github.com/madduck/ansible into envsetup2
