Merged master into UI

@erikrose I see this has a but load of commits even though I did it with the --no-commit flag. How do you want to proceed on this one?