puppetconf2014 - part 2 - Day 1
Merge branch 'puppetconf_p2' of github.com:liamjbennett/octopress into liamjbennett-puppetconf_p2
Merge branch 'liamjbennett-puppetconf_p2'
Publishing the PuppetConf 2014 part2 blog post