Add tests + expand fix re #71, #72
Merge branch 'master' of github.com:pyinvoke/invoke