cleanup after merge
PEP 8 cleanup
PEP 8 cleanup
add travis support