Athena 2.0: Discourse and User Modeling in Open Domain Dialogue