Tim's edits
Merge branch 'master' of github.com:tangerinewhite32/dotfiles-1
merge