merge classes, fixes
merge classes, fixes

IntelLabs/numba,stuartarchibald/numba,numba/numba,jriehl/numba,IntelLabs/numba,stonebig/numba,seibert/numba,numba/numba,gmarkall/numba,gmarkall/numba,IntelLabs/numba,gmarkall/numba,seibert/numba,gmarkall/numba,stuartarchibald/numba,IntelLabs/numba,seibert/numba,stonebig/numba,sklam/numba,jriehl/numba,sklam/numba,cpcloud/numba,seibert/numba,sklam/numba,numba/numba,cpcloud/numba,numba/numba,sklam/numba,stuartarchibald/numba,jriehl/numba,sklam/numba,stonebig/numba,IntelLabs/numba,numba/numba,stuartarchibald/numba,seibert/numba,stuartarchibald/numba,jriehl/numba,cpcloud/numba,gmarkall/numba,cpcloud/numba,cpcloud/numba,stonebig/numba,stonebig/numba,jriehl/numba