Merging schacon/master
Merging schacon/master

nberger/showoff,kublaj/showoff,nberger/showoff,wanix/showoff,puppetlabs/showoff,binford2k/showoff,berkes/showoff,kublaj/showoff,slambert/showoff,marrero984/showoff,nomadicoder/showoff,berkes/showoff,binford2k/showoff,binford2k/showoff,puppetlabs/showoff,hybridgroup/showoff,nomadicoder/showoff,marrero984/showoff,travisvalentine/7.27_showoff,nomadicoder/showoff,berkes/showoff,jevy/Presentations,slambert/showoff,kublaj/showoff,berkes/showoff,kublaj/showoff,nomadicoder/showoff,slambert/showoff,hybridgroup/showoff,jevy/Presentations,kublaj/showoff,puppetlabs/showoff,marrero984/showoff,marrero984/showoff,wanix/showoff,wanix/showoff,slambert/showoff,berkes/showoff,binford2k/showoff,puppetlabs/showoff,travisvalentine/7.27_showoff