Fixed tmux/xclip copy configuration
Removed some commented out stuff that only applies to my work machine
Merge branch 'master' of https://github.com/Geraint/dot-files