Code Cleanup

Cleaned Up Code, Added a few more features.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trubot/App.config
	Trubot/Database.cs