Some fixes for the builder.
Merge branch 'master' of github.com:nimrod-code/nimbuild