Bunch of random stuff
Merge branch 'master' of github.com:errnoh/platform