Accept all keywords unless otherwise specified
Change some programs
Change a lot of stuff
Add oracle-jdk for android studio
Change stuff on desktop
Merge branch 'master' into tilaa

Conflicts:
	etc/portage/package.accept_keywords
	etc/portage/package.use
	vim/vimrc