bump version
Merge branch 'master' of github.com:bbqlinux/bbqlinux

Conflicts:
	PKGBUILD