Set tab/shift width to two spaces in Vim for erb files
Switch Vim back to Solarized colorscheme (again)

Since the Solarized theme was included in iTerm recently, the setup is now quite
pain free.

If you name your Solarized profiles "light" and "dark" in iTerm, the Vim theme
will automagicaly match the currently used flavor in iTerm.