Merge pull request #5 from Plypy/master

updated ejs to 1.0.0
Minor fixes found when update groups module
Allow honeypot to be disabled in conf.signup.json
Merge pull request #6 from elliottwilliams/master

Allow honeypot to be disabled in conf.signup.json
Merge remote-tracking branch 'upstream/master'