Added layout.conf for portage
Bumped ebuilds to current versions
Merge branch 'develop'