Merge changes required to make it work on updated infrastructure

[wyhaines]

There are some unmerged changes that encapsulate the remainder of the changes needed to get everything working on puma with upgraded infrastructure. These need to be committed.