Minor refactoring

* Use alias_method_chain for the touch method override to allow for easier debugging and knowledge of where the method came from
* Remove class_eval, include the module directly