Update concatenated_vimrc
Merge branch 'master' into mac
Add mapping for exit QuickFix window
Replace syntastic with watchdogs.vim
Merge branch 'master' into mac