lots of updates
Merge branch 'master' of https://github.com/bcyphers/Vanilla-Milk-431