work on more complete matrix
Update default puppet version to current