now properly checking if we're on a darwin system
Merge branch 'master' of github.com:matijs/dotfiles