Swap in new paste buffer code and add a couple more commands.

18 files changed