Merge pull request #113 from andrewjpage/master

unstable test fixed
change log
Merge branch 'master' of github.com:sanger-pathogens/gubbins
rename convergence methods and allow for more
Merge pull request #114 from andrewjpage/rename_converge_method

rename convergence methods and allow for more