Style edits.
Merge branch 'master' of github.com:chirs/s2