Merge branch 'master', remote-tracking branch 'joejulian/master'
Merge branch 'master' of git://github.com/jbraeuer/puppetlabs-firewall