Updates to better use vagrant user
Merge remote-tracking branch 'origin/master'

* origin/master:
  Remove Jinja variable, not needed