support for apt-key keyserver parameter
Merge branch 'devel' of git://github.com/leafnode/ansible into devel

Conflicts:
	library/packaging/apt_key