Better OS detection, distro detection too
Merge branch 'master' of github.com:jdavis/dotfiles