After-merge fix.
PEP8 + minor fixes.
#46 closed: ignoring underscored source directories.