Merge branch 'features/JAL-2136_phyre2_integration' into spikes/phyre spikes/phyre
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 5 Jun 2017 13:53:05 +0000 (14:53 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 5 Jun 2017 13:53:05 +0000 (14:53 +0100)

Trivial merge