tidy up package decls, upgrade to openjdk 1.7
upgrade firefox a bit
Merge branch 'master' of github.com:telent/puppetize-noetbook

Conflicts:
	manifests/site.pp