Use % for original purpose
Don't set leader map space to leader
Updates for vim commentary