Integrate

Here is the pull request you asked for long ago.

There was the point about renaming alerts.html to dzAlerts.html, but I did not know what you intended to accomplish with that.  Hopefully you comments will.

Thanks
is this a virtualenv for this server?  I am not sure that is necessary, but would like to hear your opinion here.