New nxhtml
Added magit lib
Better php nxhtml config, configured magit
Merge branch 'v2' of github.com:tausen/emacs23-setup into v2