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