Added ag.vim
Removed excess from Xdefaults
Git use conflict style diff3
Merge branch 'master' into laptop