Rockage

DONT MERGE, wip.  Dom internal code review only.
everything removed from development-defaults.ini, we need to add back into the m13 puppet hiera config once this is merged.

this is OK and is where this data actually belongs.

@ksonney this is something you may potentially need to do for anthrocon if you merge in the master puppet branch into AC-wip