Font / New Tab Mapping
Merge branch 'master' of github.com:slabounty/dotjanus

Conflicts:
	.vimrc.after
Added Inconsolata Font / Tab Mapping