A few more minor cleanup fixes
A few more minor cleanup fixes

nfagerlund/puppetdb,kbrezina/puppetdb,kbarber/puppetdb,kbarber/puppetdb,kbrezina/puppetdb,highb/puppetdb,rbrw/puppetdb,puppetlabs/puppetdb,mullr/puppetdb,waynr/puppetdb,senior/puppetdb,ajroetker/puppetdb,ajroetker/puppetdb,nfagerlund/puppetdb,shrug/puppetdb,kbrezina/puppetdb,github/puppetlabs-puppetdb,kbarber/puppetdb,shrug/puppetdb,rbrw/puppetdb,puppetlabs/puppetdb,cprice404/puppetdb,melissa/puppetdb,cprice404/puppetdb,rbrw/puppetdb,nfagerlund/puppetdb,senior/puppetdb,github/puppetlabs-puppetdb,melissa/puppetdb,melissa/puppetdb,ajroetker/puppetdb,puppetlabs/puppetdb,wkalt/puppetdb,grimradical/puppetdb,shrug/puppetdb,mullr/puppetdb,senior/puppetdb,highb/puppetdb,grimradical/puppetdb,waynr/puppetdb,wkalt/puppetdb,mullr/puppetdb,shrug/puppetdb,github/puppetlabs-puppetdb,wkalt/puppetdb,jantman/puppetdb,johnduarte/puppetdb,waynr/puppetdb,kbarber/puppetdb,wkalt/puppetdb,jantman/puppetdb,highb/puppetdb,kbrezina/puppetdb,senior/puppetdb,puppetlabs/puppetdb,cprice404/puppetdb,mullr/puppetdb,grimradical/puppetdb,johnduarte/puppetdb,rbrw/puppetdb,johnduarte/puppetdb,grimradical/puppetdb,puppetlabs/puppetdb,johnduarte/puppetdb,waynr/puppetdb,rbrw/puppetdb,mullr/puppetdb,ajroetker/puppetdb,highb/puppetdb,jantman/puppetdb