Non-flower products to dominate 40% of cannabis market by 2020