Try to keep annotations on a single line
Merge pull request #21 from square/rice/single_line_annotations

Try to keep annotations on a single line