Refactor our branch to only contain customizations useful for others

We should use our master branch as a source of possible pull requests into the nodester repository. This merge combines a new branch that only contains those sorts of changes. I'll be submitting a PR with our specific changes soon.