Major cleaning up
Merge branch 'develop' of https://github.com/kiwi9400/qtile into develop

Conflicts:
	libqtile/resources/default_config.py
Cleaned up