Bristol City have moved into the Championship play-off places with a 2-1 victory over Norwich at Ashton Gate.