Merge branch 'autoreload-config' into local-develop
Merge branch 'dividers' into local-develop

Conflicts:
	powerline/segments/common.py
	tests/test_segments.py