vim: utf-8 and 256 color support
Merge branch 'master' into ubuntu-x86_64-emac