Merge branch 'master' of github.com:planset/dotfiles
update