Adding some changes from the work settings
Merge branch 'master' of github.com:sudotliu/dotfiles