Update to master + cargo fixes + travis doc changes