Removed some unused states. added portage_config settings
Merge branch 'master' of github.com:shadowfax-chc/salt-states