Merge pull request #19 from ubermichael/master

Add support for apigen and clean up some namespaces.