More code cleanup
Merge branch 'master' of https://github.com/bstrdsmkr/1Channel

Conflicts:
	default.py