updates
Merge branch 'master' of ssh://github-steeef/steeef/dotfiles