Updated, removed, and added things
Merge branch 'master' of https://github.com/tyler-cromwell/T-Shell