deploy
Merge branch 'master' of github.com:socketwiz/dotfiles
Merging updates