Merge pull request #1674 from stevewithington/candidate

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