Clean up and configure some boilerplate.
Merge branch 'master' of https://github.com/dxw/rsparly2013