Fix usage information for -c to indicate a conf.d directory can be used

Since puppetdb can accept a directory of configuration, the current usage
information for the -c switch is not completely accurate. This patch
changes the usage information to indicate a directory can be used for
both the 'services' and 'benchmark' sub-commands.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #564 from kbarber/config_switch_takes_directory

Fix usage information for -c to indicate a conf.d directory can be used
Fix spec tests to be compatible with puppet 3.3

One of our spec tests mocks an object from the puppet object model.
In the latest version of puppet this object had a small API change;
our mock object was not set up to handle this correctly. This
commit should make the tests compatible with all versions of Puppet
from 2.7.x, 3.0.x, 3.1.x, 3.2.x, and 3.3.x.
Merge pull request #570 from cprice404/bug/master/spec-compat-with-puppet-3.3

Fix spec tests to be compatible with puppet 3.3
Fix brackets so all assertions are tested

Prior to this commit, the misplaced brackets caused only the first
assertion to be tested. This commit corrects the brackets, and now
all assertions are tested as intended.
Merge pull request #573 from shakedown/bug/master/broken-event-test

Fix brackets so all assertions are tested
Enable PuppetDB report processor when installing from source
Skip test if sqlite3 isn't installed
Merge pull request #575 from shakedown/dev/master/test-fixes

Dev/master/test fixes