Avoid save ;w file
Use vimdiff as a git mergetool
Update hybrid color scheme

Using forked Hybrid color scheme from
https://gist.github.com/luan/6362811