Removed conflicting old timeConvert.py file from height branch to allow for merge of height and master branches