Upstream merge
Merge branch 'master' of github.com:daboross/Eliralin

Conflicts:
	CloudBot-Patches/0001-Change-reply-format-from-nick-message-to-nick-messag.patch
	CloudBot-Patches/0002-Add-proper-bot-stopping.patch
	CloudBot-Patches/0003-Add-auto-restarting.patch
	CloudBot-Patches/0004-Don-t-run-regex-matching-if-command-is-already-match.patch
	CloudBot-Patches/0005-Add-.message-command-to-raw-message-someone.patch
	CloudBot-Patches/0006-Use-permissions-instead-of-adminonly.patch
	CloudBot-Patches/0007-Update-minecraft_status-to-use-unicode-checks-and-wi.patch
	CloudBot-Patches/0008-Improve-self-attack-matching.patch
	CloudBot-Patches/0009-Change-ctcp-reply-to-return-Eliralin.patch
	CloudBot-Patches/0010-Add-connection-independent-database-idb-and-use-it-i.patch
	CloudBot-Patches/0011-Add-listfactoids-command-to-list-all-factoids.patch
	CloudBot-Patches/0012-Add-steal-command.patch
	CloudBot-Patches/0013-Create-eliralin_utility.py-for-extras.patch
	CloudBot-Patches/0014-Add-meme.py-thanks-blha303.patch
	CloudBot-Patches/0015-Replace-with-for-factoids.patch
	CloudBot-Patches/0016-Add-requests-to-requirements.txt.patch
	CloudBot-Patches/0017-Add-teamcity-plugin.patch
	CloudBot-Patches/0018-Add-per-channel-command-prefixes.patch
	CloudBot-Patches/0019-Fix-minecraft_ping-for-non-dict-descriptions.patch