Explicitly set VAULT in the Makefile and if on production server
Merge pull request #478 from abhinavc/master

Explicitly set VAULT in the Makefile and if on production server