Updated Apprentice and Disciple. Removed Wildfire.
Merge branch 'master' of github.com:romainl/dotvim

Conflicts:
	tags
Trois petits points…