Slight build file cleanup.
Merge branch 'master' of github.com:boardwalk/bzr

Conflicts:
	generate_ninja_build.py