Merge branch 'master' into #2

templates/leaderboard/base.html

@@ -30,10 +30,9 @@
 
 <P><font size=3 color="red" >As of October 17, the ~6 month time period for the GREAT3 challenge has begun, with submissions due by April 30, 2014.  We are now releasing all simulations for the control, multiepoch, and real_galaxy (12 branches total), with the final branches to be released soon.
 </font></P>
-<P><font size=3 color="red" >After this point, if problems arise we may apply an overall metric recalculation to all methods.  Therefore, do not be perturbed if you sometimes see a small change in your metric score in any given branch leaderboard.  This will most likely be renomalization so that target-meeting methods score Q~1000, and any such tweaks to the metric will be made fairly across all methods.  We do not envisage any metric changes that will alter relative rankings between methods.
+<P><font size=3 color="red" >We plan soon to apply an overall metric recalculation to all methods.  Therefore, do not be perturbed if you see a small change in your metric score in any given branch leaderboard over the coming days.  This will be an effective renomalization so that target-meeting methods score Q~1000.  All changes will be made fairly across all methods.  No metric changes will alter relative rankings between methods.
 </font></P>
-<P><font size=3 color="red" >
-The variable_psf branches, nicknamed Popcorn, were previously available but are temporarily disabled: this is while we run final checks on new simulations that fix a problem in the original release.
+<P><font size=3 color="red" >The variable_psf branches, nicknamed Popcorn, were previously available but are temporarily disabled: this is while we run final checks on new simulations that fix a problem in the original release.  Recently, an <a href="https://github.com/barnabytprowe/great3-public/issues/2">issue</a> has been identified in the PSFs used for the multiepoch simulations: we do plan to regenerate these data, and will inform everyone when this is done, but are keeping the data available for now as it is still of use for those wishing to get to grips with multiepoch images.
 </font></P>
 
 		 {% block content %}