Merge pull request #1 from jimmysong/master

Task #619 on TP:
Fix autorebase so that it pulls first and force pushes at the end.

Fix websocket so that it can take an argument for simnet/mainnet and connect to the correct ports
Merge pull request #2 from jimmysong/fixes

Fix autorebase so that it pulls first and force pushes at the end.