Move CNAME back to testing site
Merge branch 'scaleconf2013' into gh-pages
Merge branch 'scaleconf2013' into gh-pages
Merge branch 'scaleconf2013' into HEAD
Merge branch 'scaleconf2013' into gh-pages
Merge branch 'scaleconf2013' into gh-pages
Merge branch 'scaleconf2013' into HEAD