Merge from jdong; new webstats

Benjamin Mako Hill || Want to submit a patch?