Keystone XL may be dead, but the fight over Canadian oil is alive and well