Merge pull request #1580 from stevewithington/develop

remove clusterlist setting from settings.ini.cfm template
Merge branch 'develop' into feature-userui