vim: set encoding utf8
vim: replace inendLine with indentGuide
vim: modify colors
vim: update fold colors
Merge remote-tracking branch 'origin/master' into mac
vim: update sparkup trigger from ,e to ,s
Merge branch 'master' into mac