Merge application refactor branch

This PR contains the Chef changes required for opdemand/deis#179.