Update Linux specific stuff
Merge branch 'master' of https://github.com/johntfoster/dotfiles
Fixed merge issues