Fix hunk-shifting logic
Keep hunk expected positions when splitting
Port git's blame code
Add in previously-failing lines
Fix win32 errors/warnings
Fix more win32 warnings
Avoid duplicate va_copy definition under VS2013
Kill the line index
Fix 'unused thing' warnings