Merge pull request #1731 from ZappoMan/more_scripting

I looked the code over and also did some basic testing (started servers on localhost, logged in with interface).