misc upgrades
Merge branch 'master' of github.com:Onip/portageconfig