Address review comments

Fixed capitalization of messages, factored out the initrd and kernel
lines that get added/re-written, and added a (redundant but nonetheless
useful) test for config.txt in one of the unit tests.

Also switched the order of calling replace_uboot and merge_includes
after realizing I'd got those backwards for a subtle edge case!