dot files
Merge branch 'master' of https://github.com/perpetualjourney/dot-files

Conflicts:
	.bashrc
	.tmux.conf
	.vim/autoload/pathogen.vim
	.vimrc