Initial import from Diddi
Refactor - getting module basics in order and fixing style
Merge pull request #1 from ghoneycutt/initial_import_from_diddi

Initial import from diddi