Final merge before refactor

We discovered some code that wasn't merged in before the last release, so a new "final release" had to be cut. This incorporates the changes @npwalker performed to split the remaining profiles out of the repo and into their own modules.