vim: change color scheme to elflord
Merge branch 'master' into activevideo