added set_emotion_from_list method, changed set_emotion to change global current_emotion
<text> now takes emotion ratios into account
Merge branch 'master' of https://github.com/awickham/bwi