a few tweaks and bugs
Loads of small little bug and a bit of cleaning up, just a bit
corrected/updated the phylotypers a bit
merged with lucasses cleaning branch
The branch that was 'master' is now called 'old'. The branch that was 'hackathon' is now the 'master' branch.

Merge branch 'master' into hackathon