Merge init.pp and makeconf.pp functionality, so that portage::makeconf
will be used as define for every make.conf entry
Merge branch 'pull-37' into 2.x