Flames promote Conroy to GM, add Nonis to front office