Merged
Merge branch 'master' of http://github.com/jonesmz/portageconfig
Merge branch 'master' of http://github.com/jonesmz/portageconfig