Update iTerm2 to match new iTerm Colors

It has been pointed out to me that the iTerm colors doesn't work properly for some commands. I made it behave like the Xresources but I flipped the bright/non-bright colors because in my opinion it makes the terminal commands look better overall.
Merge pull request #11 from luan/patch-1

Update iTerm2 to match new iTerm Colors
Merge remote-tracking branch 'origin/master' into yasuoza/master

Conflicts:
	colors/hybrid.vim