Merge branch 'master' of github.com:rinx/dotfiles
Add some variables for neocomplete
Merge branch 'master' into linux