First pass at merging nyc changes back into OBA.  There are still some
outstanding configuration changes to resolve, and much testing to to.