Begin cleanup
Merge branch 'master' into cleanup

* master:
  Add show
Style nav and faces
Styles!
Touchup shows
Fix spacing
Merge pull request #2 from ericam/cleanup

Cleanup