Resynced Repo with Upstream Changes, fixed Build Errors
Hacked SPI

It *should* compile now, at least. But it really should be refactored to
work better with our needs.
Updated to Compile