Colorscheme and font fix
Nginx config file support
jellybeans colorscheme include but not active
Merge branch 'master' of github.com:oinak/dotvim

Conflicts:
	.gvimrc
	.vimrc
	filetype.vim