Fix (one) typo
Add vim files to gitignore
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	LUniv/univalent.tex