Renamed functions, some TODO's
Merge branch 'master' of https://github.com/chena/mood-bot