Convert to single define/umd

Alternative fix for #188