Simplify systray-fix_saucy.diff for unity-base/unity
Update ubuntu-versionator.eclass to re-create bamf-2.index at postinst stage to capture installed *.desktop files. Fix compilation of unity-extra/unity-tweak-tool now that we have $XDG_RUNTIME_DIR for systemd
Merge branch 'master' of https://github.com/shiznix/unity-gentoo

Conflicts:
	mail-client/thunderbird/Manifest
	www-client/firefox/Manifest