added --cwd for local commands
addressing conflicts
addresses #154
Merge pull request #161 from wasade/death-march

Death march
Merge branch 'death-march' of github.com:bipy/pyqi into death-march