Debugtravis

time to reconcile with master