Update nvidia-dkms, try bzr new PKGBUILD format
Merge branch 'master' of https://github.com/Alucryd/aur-alucryd

Conflicts:
	unsupported/dolphin-emu-git/PKGBUILD