Improve build speed (getter speed)
Work on templates.
Cleaning up, making pretty.
Merge branch 'master' of https://github.com/chirs/s2