Improvements to mysql_grant.

Ensure that table and user are required properties, as well as remove
the optional table handling in the provider and enforce it.
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.
Add collation with the create statement
Adjust the test to the new reality
Merge pull request #291 from inkblot/fix_issue_290

Add collation with the create statement
Fix typoed parameter.
Merge pull request #292 from apenney/fix-param

Fix typoed parameter.
Fix license to mention Puppetlabs.
Merge pull request #293 from apenney/license

Fix license to mention Puppetlabs.
Merge pull request #276 from apenney/mysql_grant_fixes

Improvements to mysql_grant.
Add all the params here as undef to make it clear what the intent is.
Merge pull request #296 from apenney/fix/add-providers-to-params

Add all the params here as undef to make it clear what the intent is.
Prepare 2.0.0-rc1 release.