Switching to instance variables

Newer versions of puppet generate a warning when accessing variables in templates without the '@'.
Merge pull request #17 from FreakyDazio/instance-vars-in-template

Switching to instance variables