Genome-wide association study of non-alcoholic fatty liver and steatohepatitis in a histologically-characterised cohort