Ahum
Merge branch 'master' of github.com:Vespakoen/dev-machine
Loads of fixes