Merge pull request #1673 from stevewithington/develop

bug fix: removing rogue quote marks
Adding missign quotes back in
edit htaccess.txt to allow for hyphens and underscores in siteid