Fix a few display bugs.

getDisplayStr() was ignoring the number of days there were left.
Merge branch 'master' into gh-pages
Improve index.html