Move group variables to their respective roles
Merge pull request #30 from jpmontez/master

Move group variables to their respective roles