Merge branch 'master' into vote_features
changed Post Schema to store thumbnail
show when someone has voted on the arrow in progress
Merge branch 'vote_features' of https://github.com/ctorstens/ScreenOverflow into vote_features
Merge branch 'development' into vote_features
added karma calculation methods to user model for user overall, post, comment karma
fix for content bug
took out some js
Merge pull request #19 from ctorstens/vote_features

Vote features
add div divisions to better formatting
Merge branch 'development' of https://github.com/ctorstens/ScreenOverflow into development
Auto filled youtube meta, add migration to post
Merge pull request #20 from ctorstens/development

Development
fixed conflict
Merge branch 'development' of https://github.com/ctorstens/ScreenOverflow into development
comments and posts are listed by karma
Add activity feed functonality
Merge branch 'public_activity' into development
Revert "Merge branch 'public_activity' into development"

This reverts commit 0d1ec74053d92029b984b368cf3ecdc1d674cdc8, reversing
changes made to e887f6b5de21f27bc9f3900169f5dcf25c74151e.
Merge pull request #22 from ctorstens/revert_pull_request_1

Revert "Merge branch 'public_activity' into development"