Fixed ssh_root if already logged in as root...duh
Merge branch 'master' of github.com:EvanK/shocktrooper