Use uWSGI and supervisor for demo site
Use normal filename for supervisor conf file
Reinstate Whoosh

Which is needed by Travis.