closed #2384
refactors to sitemap, closed #2254
first pass, #1984
second pass, #1984
final pass, #1984
removed extra db call #2254
merge
#2254 proper fix
Merge remote-tracking branch 'origin/master' into socket.io1.x
closes #2480
Merge remote-tracking branch 'origin/master' into socket.io1.x
check err in tests
Merge remote-tracking branch 'origin/master' into socket.io1.x
bugfix #1984
Merge remote-tracking branch 'origin/master' into socket.io1.x
hopefully fixing travis CI
travis CI fixes again
no need to set bcrypt_rounds, only used in one place.
travis CI again
closed #2122