Merge remote-tracking branch 'orig/master'
Strip trailing whitespace
Use @ to ref variable
Merge branch 'master' of github.com:thomseddon/puppet-redis