Merge pull request #1675 from stevewithington/develop

edit htaccess.txt to allow for hyphens and underscores in siteid