More options to users
Merge branch 'master' of github.com:raelgc/ubuntu_xboxdrv

Conflicts:
	src/debian/changelog