Refactor for diff support
removing greedy
use logging
extra dash
missing underscore
Merge pull request #14 from edx/jarv/alton-diff-refactor

Refactor for diff support