A unified, contemporary approach to teaching energy in introductory physics