solarized-theme.el: only require `solarized' not the theme libraries

Doing so would cause both themes to be loaded.
Add `company-template-field` faces

These appear when company allows one to tab through placeholder
arguments in a method (like yasnippet).
Merge pull request #148 from tarsius/noload

solarized-theme.el: only require `solarized' not the theme libraries
Merge pull request #149 from bradleywright/company-template-field-faces

Add `company-template-field` faces
Add elscreen-mode face

https://github.com/knu/elscreen
Merge pull request #150 from takethathe/master

Add elscreen-mode face
Merge remote-tracking branch 'upstream/master'