Added a reminder to copy over the necessary files to /scratch/diamond.
Merge remote-tracking branch 'origin/master' into gh-pages