Fixes issue where macro -d did not properly delete the macro
Fixes issue where the macro name could be an existing command name
Merge branch 'master' of https://github.com/ameily/pypsi