First cut at cleaning up and documentation
Merge branch 'master' into doc

Conflicts:
	src/katello/tests/navigation.clj
Merge pull request #916 from weissjeffm/doc

First cut at cleaning up and documentation