update to puppetdb 2.2.0

I've merged both our earlier PR's (#5 and #6) and corrected some paths or redundant modifications and afterwards I've update the port to puppetdb 2.2.0.