add labels feature to slave nodes
correct
add ability to control the version of java installed on a slave
add ability to disable firewall configuration
Merge branch 'controlFirewall' into merged
fix merge issue
Use anchors to ensure ordering with jenkins class
Merge pull request #15 from dcrissman/merged

On slave, add labels and ability to control java version. On master node, add ability to disable the configuration of the firewall.
Cleaning up the readability of the anchor commit.
Merge branch 'master' of github.com:jenkinsci/puppet-jenkins into abustany

Conflicts:
	manifests/init.pp
Standardizing the calling format for the classes in init.pp
Merge pull request #19 from matthewbarr/abustany

Use anchors to ensure ordering with jenkins class
merge in changes from master