modify .bashrc
update .bash_mac
change .Rprofile
change .bash_mac
change screen setting
change .gitconfig
Merge branch 'recruit' of https://github.com/hereticreader/dotfiles into recruit

Conflicts:
	.Rprofile