Bug 1053940 - updated private key location, makefile, and some cleanup of whitespace