Reworked some of Jarrod's shortcuts in vimrc