Sync with tree

Sync overlay with the tree, see issue  #26. In the future all the changes should be done in the overlay first and only then propagated to the tree.

The only difference that these ebuilds have with the tree is 'heather' USE flag in the live version.

Please, review and merge if everything is ok.