Added in 'stty -ixon' to xinitrc so Ctrl-X-S doesn't break vim (damn
emacs habits)
Merge branch 'master' of github.com:wavejumper/dotfiles