Merge pull request #1683 from stevewithington/candidate

add secureCookies attribute to settings.ini.cfm template
Merge branch 'candidate' of git://github.com/blueriver/MuraCMS into candidate