Changed border width to default value and inactive color to gray.
Added textwidth to c/++ files.
Merge branch 'master' of github.com:bbguimaraes/dotfiles

Conflicts:
	.vimrc