Points have, not has
Commit to do a thing.
Merge branch 'master' of github.com:rawsonj/triviabot

Conflicts:
	questions/computers.txt
Merge branch 'cleanup' of https://github.com/edunham/triviabot into edunham-cleanup
Wrangled the questions into their more normal distribution.
Also removed non-printable characters and weird trashed unicode.
Merge branch 'grammar' of https://github.com/edunham/triviabot into edunham-grammar
Move configurable stuff to config file, and add defaults
Fix merge conflict.

Note that the changes are currently UNTESTED and might break things. Please
don't merge yet. It looks like I need to go off on yet another branch and
write test/debug features before this will be ready.

Conflicts:
	trivia.py