Fixes ui
Merge branch 'master' of github.com:plcstpierre/config

Conflicts:
	vim/vimrc