Further PEP8 wrngling, fixed runtable problem with portable path
Fixed tests failing because of path changes
Added word_margin parameter, set to zero - still passes tests
Fixed renaming of a function to g