The zencoding vim plugin is now an emmet plugin at a different url, also
added some git aliases
Merge branch 'master' of github.com:zeorin/dotfiles