Added logic to (hopefully) fix solarized colors
Merge remote-tracking branch 'origin/master'