Switch back to xterm16 colourscheme for vim.
Ruby should be two-space indent.
Merge branch 'master' of git://github.com/bma/config