Various bugfixes

Signed-off-by: Matthew Harrison <Matthew.Harrison@noaa.gov>
Merge branch 'master' of github.com:mjharriso/MIDAS