Fix some tmux funny business, add .swp to gitignore
Merge branch 'master' of github.com:michd/dotfiles