Cleaned up code.
Merge branch 'master' of github.com:jhfi/BasicBot