tmux and other stuff
Merge branch 'master' of https://github.com/DerekLouie/backupfiles

Conflicts:
	.vimrc
added diff folder for swp files