Stopped macvim alias overwriting standard vim.
Made dotfiles shortcuts use $EDITOR.