Merge branch 'master' of https://github.com/lgbennetts/CITEPH-64-2012
"Unsure why this merge is required"
Merge branch 'master' of https://github.com/lgbennetts/CITEPH-64-2012