Comimting shizzle
Fixing merge conflict
Adding backupdir to vimrc