change doc to rst
cleanup
merge