This sets us up for a usable org-mode branch.
Merge branch 'master' of https://github.com/Choens/analytic-template-r
Merge branch 'master' of https://github.com/Choens/analytic-template-r

Conflicts:
	R/README.md
	analysis.R
Improvements to the packages.R file to address problems I found.
Update to the config file.