Master

I had to apply the following 2 quick fixes in my local copy of the ensembl repository. It's just swapping the columns in a sql query and adding the use of 'warning' which is used but it hadn't been declared.