Some minor changes
Change the font size for ubuntu gvim
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc