Integrate live and github configurations

Found some substantial differences in configuration with the copy sent to me this morning, integrated the two. Recommend test.