Browserified tether
Fixed bad merge