wrote tests to check that check.settings handles user/userid/username properly
Merge branch 'master' of github.com:PecanProject/pecan

Conflicts:
	settings/R/read.settings.R