new support for beta builds of illumos
Merge branch 'master' of https://github.com/insanum/dotfiles