vim: update sparkup trigger from ,e to ,s
Merge branch 'master' into ubuntu