Prior checking user defined theme
Merge branch 'use_defined_theme'

Conflicts:
	plugin/airline.vim