Merges in master, reverts travis config and readme