Fix type cast of entry id in hash table
Merge branch 'devel' of git://github.com/numba/numba into devel
Fix basic block phi merge for IfExp (obsolete once phimerge is done)