Merge branch 'master' of https://github.com/skwp/dotfiles

* 'master' of https://github.com/skwp/dotfiles:
  neocomplete: update settings
Merge branch 'master' of https://github.com/grossjonas/dotfiles

* 'master' of https://github.com/grossjonas/dotfiles: