Add magit faces
Merge pull request #22 from dholm/feature/magit

Conflicts:
	solarized-theme.el