alternative computation for surprise likelihood
Merge branch 'master' of github.com:Anaphory/xkcdmemes

Conflicts:
	parse.py