Fix puppet module being included twice
Fix dependancy ordering