Solarized ls colors for Mac OS X
Removed unneeded modules
Merged modules