Upgrade to AF 9.0.0.beta5

I expect several things to be broken here. @awead, perhaps you can fix the version stuff?  I know this will probably need to be rebased.