Update builddep.pp
Prep for 1.6.0 release.
Prep for 1.6.0 release.
Merge branch '1.6.x' of github.com:puppetlabs/puppetlabs-apt into 1.6.x
Add configuration file for modulesync

https://github.com/puppetlabs/modulesync
Update .sync.yml to support new .travis.yml configs
1.5.3 prep
Sometimes killing apt is too aggressive.
Cleaned up acceptance tests

A lot of the tests were testing things that really should be tested via
unit tests, so those were deleted and unit tests will be revamped to
make sure they are covering everything they need to be covering.

Conflicts:
	spec/acceptance/unattended_upgrade_spec.rb
Cleaned up unit tests.
Missed test refactoring in CHANGELOG
Merge pull request #345 from mhaskel/merge_1.5.x_changes

Merge 1.5.x changes
Clean up test failures
Merge pull request #346 from mhaskel/1.6_test_fixes

Clean up test failures
Don't hardcode /etc/puppet as the puppetpath.
Merge pull request #347 from mhaskel/hiera_fix

Don't hardcode /etc/puppet as the puppetpath.
(DOC-1230) Update all short key examples to use the long key id
Merge pull request #359 from haus/ticket/master/doc_1230_update_example_keys

(DOC-1230) Update all short key examples to use the long key id
Merge branch '1.6.x' into test
Merge pull request #360 from mhaskel/test

Merge 1.6.x into master