Update to zencoding-vim and delimitmate