Merge branch 'master', remote-tracking branch 'origin'
Migration of new merge code.
Move of code and docs from (cvs) ensembl personal ak4 to (git) ensembl-analysis/scripts/Merge