switch vegetable oil to canola oil

merge new oil into master