Restore Pen tool undo/redo and fix incorrect triggering of undo when changing tools

Restore Pen tool undo/redo and fix incorrect triggering of undo when changing tools #756