Added ElastiCat support
Moved waratek class inclusion
Puppet debug options