Merged most code from [whateversh](http://github.com/dgelessus/whateversh). Changed all commands so they will no longer run immediately when imported for some reason. Various minor code changes/fixes/simplifications.