Change resource refs to point at class

Prior to this commit we were pointing to the packages this commit
updates the ordering to use the classes themselves
Fix Tests for puppet 3.2.3+ and r10k 1.0.0+

Prior to this commit our spec test were failing as the logic in the
class was backwards in for the respective conditions