Merge branch 'less-throws' into local-develop
Merge branch 'less-throws' into local-develop
Merge branch 'powerline-reload' into local-develop

Conflicts:
	powerline/__init__.py
	powerline/segment.py
Merge branch 'improved-generate_gradients' into local-develop
Merge branch 'virtcol-current-gradient' into local-develop
Merge branch 'doc-lint' into local-develop

Conflicts:
	tests/vim.py
Merge branch 'less-throws' into local-develop