Import cleanup
Merge branch 'master' of github.com:mikesname/docview
Various minor cleanups to facet code and imports