Integrating travis-ci with a puppet default node
Prepend sudo(8) in various travis script commands
1369 - Integrate ensure_dependencies.py script
122 - Create draft for using Hiera as node classifier
122 - Replace classify.sh with Ruby script, introduce host roles
122 - Remove hiera/environments/production link
122 - Avoid installation of puppet-node-classifier.rb in /usr/local/bin
Merge branch 'master' into 122-external-node-classifier
Merge branch 'master' into 1369-integrate-ensure-dependencies-script
Merge branch 'master' into travis-ci
Merge branch '1369-integrate-ensure-dependencies-script' into travis-ci
122 - Fix puppetlabs-keyring.gpg
122 - Ensure install-precise.sh being executable
122 - Ensure puppet-node-classifier.rb being executable
122 - Fix puppet/hiera/facter APT pinning
Merge branch '122-external-node-classifier' into travis-ci

Conflicts:
	Vagrantfile
	manifests/nodes.pp
Travis - Integrate with puppet node classifier
Merge branch 'upstream' into 122-external-node-classifier
Merge branch 'upstream' into 1369-integrate-ensure-dependencies-script
1369 - Use explicit revision IDs rather than "tip" for dependencies