Refactored puppet manifests and config stuff based on beije/dev-environment