Changes that works better with the new version of spf-13's vim