Add a $key_options parameter, which need to work apt-key via proxy.
Merge remote-tracking branch 'upstream/master'
add new puppet version to travis
Fix stdlib version dependency
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
	.travis.yml
	Modulefile
fix conflicts
fix 'puppetlabs/stdlib' dependency
Merge pull request #122 from strangeman/master

Add a $key_options parameter to apt::key.