use of variables w/ out a '@' has been deprecated, and as of 3.2.x Puppet warns about it
Merge pull request #185 from ChrisRut/master

fix variables in templates
avoid unnecessary whitespace
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql

Conflicts:
	templates/my.cnf.erb
Merge branch 'replication-configuration'