Merge pull request #1 from blarghmatey/prod

Fix typo in salt service enable parameter
Reverting back to using HG repository
Merge branch 'master' into prod