Updated with latest from https://github.com/jncronin/rpi-boot