Random commits.

Having random problems with dependencies, so switching back to macports, which
means the end of this branch. Will probably switch back to homebrew, but for
now macports is going to be easier.