Unify presentation of bit mask and named integer strings.
Merge pull request #116 from square/jw/unify-to-string

Unify presentation of bit mask and named integer strings.