Added measures against making the bot kick itself.
Added newline at the end of file.
Merge branch 'master' into console