Refactor variables to top scope
Merge pull request #606 from ppp0/issue-606

Fixing little code smells
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-604
Change handling of aliases list