Bring the update process into the Master branch.
Fix some git pathing between branches.
Fix missing call to update_status
graceful_startup in context processor
merge from Windows
javascript shutdown
Changed update_adsm_from_git to simple set a flag and open an info modal.  #240  Deleted settings db.
Minor: fixed false complete status on Disease.
Readme added line about resetting a bad merge.
Another try with using the memoization table. Since distances are kept in sorted order, the contact spread model (which asks for recipients closest to 'x' km away from source) can take advantage of that by bsearching directly to the units that are closest to 'x' km away. However, the overall runtime is still slower than without memoization. This commit also drops timsort in favor of qsort, which comes out faster in tests.
Merge branch 'master' into distance-speedup