clean-up
Merge branch 'master' of https://github.com/welcor/tbamud

Conflicts:
	src/interpreter.c
cleanup