Removed some vimrc bindings, added some others