Factor out xqueue vars into own vars file, plus minor changes
Merge pull request #272 from edx/jbau/factor-out-xqueue-vars

Factor out xqueue vars into own vars file, plus minor changes