Merge conflicts
Remove mpd from zprofile
vim: treat html as htmldjango
vim: better /more verbose markdown support
vim: better splitchar
vim: small pymode changes + cleanup
vim: small pymode cleanup