add statement-cont offset to ++ for java mode
check for existence of htmlize, and use the default of iswitchb-buffer-ignore
add support for xhtml5
if custom magit/ is installed in .emacs.d, use it.
add cinsk/org-sourcefy
Merge remote-tracking branch 'origin/master'
refine `org-agenda-files` for better file inclusion
refine the setup process for magit (either git version or packaged version)
Merge remote-tracking branch 'refs/remotes/github/master'