address review comments

Type name "entity" as a constant; elasticsearch calls them types, hence
typeName.

Documentation and punctuation fixes

Add Order type for printf-less json marshaling.

Allow aliased names as well as raw names in query building.
Merge branch 'refresh-index' of github.com:jrwren/charmstore into refresh-index