Re-merged https://github.com/jaysalvat/buzz/pull/31 by hand

to adapt for new directory structure. Also followed coding
conventions of original buzz. No changes in logic.