refactor out duplicate code
fixup documentation
Add Remove and Rename Contact commands

The syntax for these commands is:
mv-contact oldName newName
rm-contact name
Fix up contact rename and delete commands.

1) The commands didn't use the current context at all.

2) The delete command corrupted the state file.