Further fixes to sitewatch
Merge branch 'develop' of github.com:mozilla/towtruck into develop