nothing much
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc
set the latex flavour
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc