merged changes in sfs/dv/keyword/wiki
tiny pep8ization
merge recent keyword.py changes