Merge pull request #37 from nhardy/master

Fixes displaying a story
Merge pull request #43 from nhardy/old

Fixed bug with pruning on short stories
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word into minor-changes
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word into voting-changes
Fix for space-separated classes.

Fixed in another branch, but for the sake of the PR.
Merge pull request #44 from nhardy/minor-changes

Minor changes
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word into voting-changes
Simplified logic of Word.has_voted(voter)

as per @Mause's recommendation.
Simplified Word.direct_voters
Simplified Word.voters
Fixed bug from previous fixes

@Mause: it does need to check if voter is None first otherwise it tries
to access .username on None (boolean logic short-circuits this if voter
is None).
Merge remote-tracking branch 'origin/voting-changes'