Lots of updates from work
Merge branch 'master' of https://github.com/Lykathia/.dotfiles