Moved magic inside location block for the unicorn app to avoid parameter conflicts.
Adding a magic variable for unicorn's location block.
Merge pull request #25 from puppetlabs-operations/fix_vhost_unicorn_template

Fix vhost unicorn template