cleaned up requires
more cleanup in routes/user.js
Merge pull request #585 from akhoury/master

During 11k users migration, was hitting too many open files errors
Merge remote-tracking branch 'upstream/master'
Revert "websockets to follow same nodebb modules pattern to avoid circular dependencies"

This reverts commit 406f7e3700679f1a268fd2400405ab9525de72d6.
websockets to follow same nodebb modules pattern to avoid circular dependencies