Preparing for merge.

Signed-off-by: Paul Buonopane <paul+git@earth2me.com>
Merge branch 'master' of github.com:Zenexer/CrossPlatform
Updated for Solarized color scheme.

Signed-off-by: Paul Buonopane <paul+git@earth2me.com>