update
Merge branch 'master' of https://github.com/kevinushey/etc

Conflicts:
	Emacs/.emacs
	R/Mac/installRdevel-mac.sh