Fixed alias merge tool >> mergetool
Adding CtrlP edits to vimrc