Tweak calibration box location
Update readme with link to gh-pages version
Merge branch 'refs/heads/master' into gh-pages