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
Updated content to conform to README best practices template

*Note: I thought this was small enough to forgo a TOC. Please let me
know if one is desired and I can add it in.*

Before alterations, this content was the module author- determined
description of and instructions for use of the module.

As part of a joint Forge/Docs team effort to standardize formatting and
encourage quality module documentation, a best practices README
template was created via internal and external user testing. That
template was then applied to this module.

I pulled in content from the original README on GitHub. Standard
headings were added (Overview, Module Description, Setup, Usage,
Implementation, etc.) to organize content, existent content was moved
under its appropriate heading and edited for tone/flow/clarity, and
basic formatting was done to adhere to template standards.
Merge remote-tracking branch 'lauren/master'

Conflicts:
	README.md
Restrict the versions and add 3.1
Merge pull request #112 from richardc/patch-1

Restrict the versions and add 3.1
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