git: use default conflict style
vim: don't open syntastic error window automatically

vim-airline already shows syntastic information so we don't need an extra
window. If desired the syntastic window can still be opened via 'Errors'
command (and closed via 'lclose').
Add some word to spellfile