updates
Merge branch 'master' of github-buren:buren/dot-bash