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
replace aptitude with apt in apt::force
Location changed:

http://backports.debian.org/news/Backports_integrated_into_the_main_archive/
Fix apt::release example in readme
add @ to variables in template
Remove deprecation warnings for pin.pref.erb as well

Signed-off-by: Ken Barber <ken@bob.sh>
Update travis.yml to latest versions of puppet

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'template_deprecation_warnings'

* template_deprecation_warnings:
  Update travis.yml to latest versions of puppet
  Remove deprecation warnings for pin.pref.erb as well
  add @ to variables in template
Update manifests/init.pp

If a proxy is set and then later unset we need to remove the proxy file. As it currently sits it'll just sit there hanging out.
Update manifests/init.pp
Update manifests/init.pp
Add spec test for removing proxy configuration.
Merge branch 'proxy'

* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp
Merge pull request #117 from bkg/docfix

Fix apt::release example in readme
Release 1.1.1

CHANGELOG & Modulefile updated.

Signed-off-by: Ken Barber <ken@bob.sh>
Add optional architecture qualifier to apt-sources
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
	.travis.yml
	Modulefile