fix formatting, also remove duplicate stuff and use hash merging
fix formatting, also remove duplicate stuff and use hash merging

chtyim/infrastructure-puppet,apache/infrastructure-puppet,stumped2/infrastructure-puppet,sebbASF/infrastructure-puppet,stumped2/infrastructure-puppet,apache/infrastructure-puppet,chtyim/infrastructure-puppet,sebbASF/infrastructure-puppet,stumped2/infrastructure-puppet,stumped2/infrastructure-puppet,chtyim/infrastructure-puppet,chtyim/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,chtyim/infrastructure-puppet,sebbASF/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,stumped2/infrastructure-puppet,stumped2/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,chtyim/infrastructure-puppet,sebbASF/infrastructure-puppet