Add puppet specific settings
Removed souring tab-shifting mappings