Merge branch 'fix-solarized-colornames-prefixed' of https://github.com/pearofducks/powerline into pearofducks-fix-solarized-colornames-prefixed

Conflicts:
	powerline/config_files/colorschemes/shell/solarized.json
	powerline/config_files/colorschemes/vim/solarized.json