This works way better since it doesn't freeze anymore!
Merge branch 'master' of github.com:tlunter/dotfiles
Merge branch 'master' into stark-linux
Fixed for stark