paul-hoehne/simon — pull request #2 by paul-hoehne (2014-10-04 16:55:52+00:00)
Title: Cleaning up charing functions.

Mostly this is deleting curft functions and moving things around to a more logical arrangement.