Remove local nxml patch for ERB: we're using mmm-mode instead anyway
Centralise html config in new init-html.el
Note about how site-lisp is used for package.el in Emacs 23
Use setq-default for js2 default overrides
Remove references to obsolete js2-mode variables
setq-default for javascript basic indent
Ignore ~/.emacs.d/image-dired
No need to bind TAB specially in js2-mode these days
proxy settings in init.el
disable some useless modules
display flycheck indicator at the right fringer
customized keybindings
customized unicode character font
introduce later version cedet as submodule
enable git-gutter-fringe
Configure cedet
global enable diff-hl-mode
merge .gitignore
disable annoying emacs-lisp-checkdoc
resolve conflict