Manually adding Traveline due to conflict, closes #104