FD acquire, One block and bugfixes

There was an error in the camera state machine. It should check for
whether i<e before waiting for the delay. This way if the cameraDelay is
long then it should move straight to imStage 5 when all images are
acquired. i.e. swapped the two lines over.

Also added Flat Dark acquire option and acquire one block option (for
grid imaging)