Pushing latest commits.

I'm not entirely certain of what's in here - probably the merge I ran a few minutes ago, and some more playing around with the boot splash screen.