Merge in everything

Merges bobtfish/puppetlabs-razor with yelp/puppetlabs-razor.