Giving up solarized
nginx syntax support
Merge branch 'master' of github.com:oinak/dotvim

Conflicts:
	filetype.vim