Updates
Merge branch 'master' of github.com:Vespakoen/dev-machine