Update inst 12/9 locally
Conjoint data and help

Merge branch 'master' of github.com:mostly-harmless/radiant

Conflicts:
	radiant-sync/sync2dropbox.sh