Merge pull request #1333 from Arantor/release-2.1

Why we do large changes in small pieces rather than en-masse.
Merge pull request #1334 from Arantor/release-2.1

More things that were broken but now hopefully fixed
Merge pull request #1335 from Arantor/release-2.1

! Remove simple search, fixes #1331
More HTML5 goodies

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Oops

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1336 from Oldiesmann/release-2.1

More HTML5 goodies
! Don't count index.php and .htaccess towards number of files in directory, per #597

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1337 from Oldiesmann/release-2.1

! Don't count index.php and .htaccess towards number of files in directo...
! Proper fix for the issue fixed in the last PR/commit

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1338 from Oldiesmann/release-2.1

! Proper fix for the issue fixed in the last PR/commit