Chromebook unicode font
Merge branch 'master' into chromebook
Merge branch 'master' into chromebook
Merge branch 'master' of github.com:aaronlord/.vim

Conflicts:
	.vimrc