Merge pull request #980 from stevewithington/develop

web.config and .htaccess bug fixes
Removing extra closing cfif #984
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop