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

Trivial merge