Add calfw faces
Merge pull request #7 from dholm/feature/calfw

Conflicts:
	solarized-theme.el