Removed proxy from gitmodules, and added gnome-terminal-colors-solarized
Merge