Disabled mark.py @md-5
A dash of PEP-8
further pepping, spelling and other such things
pepepepep8
Fixed mcping on windows :)
Reduce line length
messing with dice
Resolve 'time' name conflicts
Delete puush.py
Delete disabled_plugins
tidying!
no message
Add per-channel regex filtering.
Merge pull request #204 from daboross/patch-2

Add per-channel regex filtering
Tweaks, improved reddit
more little things
Tidy Imports
Merge branch 'develop' into refresh

Conflicts:
	disabled_stuff/mygengo_translate.py
	plugins/attacks.py
	plugins/core_sieve.py
	plugins/fortune.py
	plugins/geoip.py
	plugins/mark.py