Only purge hosts-entries if we manage localhost-entry
Merge pull request #312 from njam/issue-312

Only purge host-entries when managing hostname/localhost
Added ffmpeg module
Added key_content
Added deb-multimedia
Refactored to use deb-multimedia
Merge branch 'issue-314' into issue-310
Merge branch 'issue-313' into issue-310
Added line to end of file
renamed 'key'
Added new line to end of files
Merge pull request #313 from kris-lab/issue-313

Extend apt::key with key_content
Simplify puppet::module, stick to version
Rename stdlib module
Merge pull request #296 from njam/issue-296

Make sure "puppet module upgrade" doesn't fail so often
Fix module name
Merge pull request #315 from njam/issue-315

Fix module name
Added spec
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-314
Use port-variable for puppetdb monit entry