travis, correct branches
travis, some cleanups for unifdef