Manual changes from github
More manual merges
Don't use names that conflict with base R
Manual fixes
Make proper links
Delete unneeded envvars