Merge pull request #1 from pb66/processlist

Processlist
Merge pull request #2 from emoncms/master

updated from upstream
added explanation and options for password reset
Merge pull request #207 from pb66/enable_password_reset

Enable password reset setting