fixing namespaces
Merge branch 'master' of git://github.com/HyborianSolutions/fuzzypeanut