Matchit fixed
Adding nginx module
Merge branch 'master' of http://github.com/hron84/dotvim

Conflicts:
	.gitmodules