Multimedia keys
Merge branch 'master' of https://github.com/sosterwalder/dotfiles

Conflicts:
	awesome/rc.lua.symlink