Fixing lint and adding the trusty nodeset (not sure how that was missed)
Merge pull request #299 from mhaskel/1.5.0-prep

1.5.0 prep
Merge branch '1.5.x' of https://github.com/puppetlabs/puppetlabs-apt into 1.5.x
Merge pull request #303 from apenney/fix-ubuntu-10-tests

Fix the tests for Ubuntu 10.04.