pep8
pep and docs
merge master into categorical vector hazard