Clean up schwilk-theme.

Fix some incorrect face names.
Remove erc related faces as unnecessary.
Merge branch 'master' of https://github.com/dschwilk/schwilk-emacs-starter