Fixing fucked up GIT

Master is missing changes I made which are required for demo as well as
uart fixes.
Git may not be trustworthy. Something is setup wrong maybe