Apache settings updated
Merge branch 'jon' of https://github.com/puruckertom/ubertool_cts into jon
Minor changes
Merge branch 'jon' into nickp
Merge branch 'nickp'