fixes db query in c_users
commit on master before merging in branch
committing because git is telling me to commit so i can merge a branch
merges clean-users-controller
merges clean-users-controller
Merge branch 'users-to-users'

nch 'users-to-users'
adds links to 'so-and-so said:' in posts/index
gets stream working
Merge branch 'master' into clean-users-controller