Removed demo config from shell code.
Merge branch 'master' into gh-pages