Changing font to Inconsolata 11 (from Inconsolata for Powerline 13
Merge branch 'master' of github.com:adam-may/dotfiles

Conflicts:
	.vimrc.local