modifications on .vimrc
Merge resolution
Modification on autocmds. Addition of if has(autocmd) for compatibility
words added to en spell list