Merge pull request #55 from danw/bootstrapcleanup

Fix bootstrap and separate buildDir ninja cleanup