Tidied up some code
Merge branch 'master' of github.com:alathon/AwesomeMUD