Fix bug where restarting the server (e.g. after update) would fail when not running as root.
Merge branch 'master' of github.com:sandstorm-io/sandstorm
Tweak button titles to avoid the word 'grain' in end-user-facing text.