updated
Merge branch 'master' of github.com:torkelo/dotfiles
updated