Deep House Music, Deep House and House Music