Fixes issue #274 by using recursive hash merge.
Fix mysql::client.

This was still relying on globals.  Allow you to pass params into
mysql::client properly to set the package.
Merge pull request #285 from apenney/client

Fix mysql::client.
Add 3.3, strip down the excludes.
Merge pull request #282 from mediatemple/fix/master/merge_function

Fixes issue #274 by using recursive hash merge.
Merge pull request #286 from apenney/travis

Add 3.3, strip down the excludes.
Use mysql::server::root_password instead of @options.
Merge pull request #288 from apenney/passwd-fix

Use mysql::server::root_password instead of @options.