Updates
Merge branch 'combined' of github.com:drescherjm/gentoo-keywords into combined

Conflicts:
	base/package.keywords/applications