There is a difference between hip hop and rap music. In other words, if you rap about money and hoes, then you make rap music. Sorry about all these damn quotes. Anyway, the term hip hop definitely has a broader, more inclusive, meaning other than just being a genre of music. But the only distinction between hip hop and rap music is that rap is the broader category within which hip hop should be classified.
Rap music is simply any music where the lyrics are delivered in a rhythmic, non-singing manner.
For example, Limp Bizkit and Kid Rock all border on rap music because they don't really sing. Therefore, we find that any music which falls between spoken word and singing is rap music. By this classification, we could actually say that jungle MCs are also rappers, even though the music they rap over is definitely not hip hop. Hip Hop is Black music. It is true that almost every significant hip hop artist is African-American, and that hip hop got its start in Black communities.