Fixed a few vim bugs with Make