Update Arch Linux optdepends and conflicts
Merge branch 'fix-archlinux-packages' into develop
vim: Fix missing qf buffer highlighting
Merge branch 'fix-quickfix-buffer-highlighting' into develop
Merge branch 'develop' of git://github.com/Lokaltog/powerline into develop