Nearly finished refactoring.
Merge branch 'master' of github.com:brachyprint/brachyprint