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
Merge remote branch 'upstream/master' into innodb-configuration

Conflicts:
	templates/my.cnf.erb