Merge-in of 2m branch from LCOGT SVN

TimJ, I have (I think/hope) correctly merged in the next one of the LCOGT SVN branches. This one adds support for the LCOGT 2m imaging instruments Spectral and Merope, and added the basics (incomplete, back-burnered) of support for the FLOYDS spectrograph. 

Could you please review and check I've done The Right Thing and branched in the correct place and merged/rebased the right way.