Clean up draw code ready for veiw params
Merge branch 'master' of github.com:malariagen/panoptes