refactored run plan handling, fixes prymitive/upaas#56