Developing large-enrollment, conceptual physics courses: active-learning and scientific practices for non-majors