Passing syntastic for HTML
Change git conflict style to diff3
Read file from index in pre-commit hook

This validates against what we are *committing*, not *what's in our working
tree*.
CtrlPMixed mode was not woring for me
Misc