More build fixes.

For some reason the build was still failing on a different computer, so I
fixed up a few more things to get it building again.

Also updated README with build instructions.