more cleanup
update bootstrap, update travis config