-a

disable flymake for html/xml
updated emacs and git config
Merge branch 'master' of https://github.com/lordvlad/dotfiles