make sure php gets installed before drush
fix another dependency bug
Revert "Fix puppet drush install class command"

This reverts commit ac0225a66a92057431ed59eb3366a1ffe53faffd.
Merge remote-tracking branch 'remotes/upstream/master'