Updated keychain plugin.
Add a pyedit command thanks to @srossross
Made keychain a bit more verbose.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add a pyedit command thanks to @srossross