Delay of 2s across the board

Remove the second variable delay in takePhotoWithDelay and passing
delay through to ImageSnap. More consistent delays all around