Add popup faces
Merge pull request #14 from dholm/feature/popup

Conflicts:
	solarized-theme.el