Properly solarizes vim.
Adds branch name to prompt if one exists.