2013-07-23 - production
23:34	<andrewbogott>	done messing with sockpuppet, stafford, puppet-merge, etc for now.	[production]