Apply collected patches from @Greduan

Source: https://github.com/altercation/vim-colors-solarized/commit/4843c0251b4a7d825749baef4f7e88ccb66e7dde