updating to use models instead of dao direct
Merge remote-tracking branch 'upstream/master'
altering stream to read from Everything
Merge remote-tracking branch 'upstream/master'
fix to stream
Merge remote-tracking branch 'upstream/master'
fix to stream
Merge remote-tracking branch 'upstream/master'
fix to stream
Merge remote-tracking branch 'upstream/master'
fixing query.py import json
using local version of jsite and adding phd models
Merge remote-tracking branch 'upstream/master'