fix bug with times
Merge branch 'dev' into harris
small bugfix so flight leaves after user specified time