Normalize naming and reference conventions.

 * Don't use 'this' when it's not needed.
 * Local Segment references are 's'.
Merge pull request #99 from square/jw/convention-normalization

Normalize naming and reference conventions.