Fix p-leader-key indentation
Clean up some keybindings

Get rid of unused ones/move some others around
Speed up startup a bit by not requiring magit