delete any mention of SAFE_GETLINE so it doesn't reappear
Merge ../mosesdecoder into hieu