I consider myself a humanist, and I feel that such a label encompasses feminism. If you're a humanist, then you're a feminist, since women are human. A humanist stands for equal rights, treatment and laws for ALL humans - men, women, black, white, poor, rich, etc.
Now, granted, the world cannot be composed of just humanists. It's too broad a group, and since it tries to fix everything, it'll end up probably fixing nothing. Feminism is an essential component of humanism, and feminist activists should focus on feminism - after all, someone has to.
I just prefer to call myself humanist.