Merge branch 'puppet-community/master' into 0.1.0

Fixing merge conflicts

Conflicts:
	puppetboard/app.py
	puppetboard/forms.py
	puppetboard/templates/catalogs.html

puppetboard/app.py

@@ -379,7 +379,7 @@ def reports(env, page):
     total = get_or_abort(puppetdb._query,
         'reports',
         query='["extract", [["function", "count"]],'\
-            '["and", ["=", "environment", "{0}"], ["~", "certname", ""]]]'.format(
+            '["and", ["=", "environment", "{0}"]]]'.format(
                 env))
     total = total[0]['count']
     reports, reports_events = tee(reports)

requirements.txt

@@ -5,5 +5,5 @@ MarkupSafe==0.19
 WTForms==1.0.5
 Werkzeug==0.9.4
 itsdangerous==0.23
-pypuppetdb==0.1.1
+pypuppetdb==0.2.0
 requests==2.2.1