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
whitespace fixes
Merge pull request #102 from mmoll/lint_fixes

whitespace fixes
Update travis config file

This commit adds ruby 1.9.3, puppet 3.0.2 support and a
build status image to the README.
Merge pull request #105 from blkperl/update_travis

Update travis config file
Build all branches on travis

We should build all branches for travis, otherwise users won't be able to test
their own feature branches.
Merge pull request #106 from blkperl/build_all_branches

Build all branches on travis
Standardize travis.yml on pattern introduced in stdlib
Merge pull request #107 from blkperl/travis_update

Standardize travis.yml on pattern introduced in stdlib
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