modified args to combine_data
modified get_until_got function
Merge branch 'refactir' of https://github.com/svalinn/condorht_tools into refactir