Merge in API-integration work.

This branch has progressed beyond API-integration and into the new direction of the site.  So now is a prudent time to merge :)