initial commit
Merge branch 'master' of https://github.com/skibz/dotfiles

merge with upstream