Merge branch 'release/1.0.1' into python3.4

Author: dmptrluke

README.md

@@ -52,6 +52,7 @@ If you think you have found a bug/have a idea/suggestion, please **open a issue*
 You can find a number of example bots in [#CloudBot](irc://irc.esper.net/cloudbot "Connect via IRC to #CloudBot on irc.esper.net").
 
 ## Changelog
+ - **1.0.1** - Fix history.py tracking
  - **1.0.0** - Initial stable release
 
 ## License

plugins/history.py

@@ -54,7 +54,7 @@ def track_history(event, message_time, conn):
     history.append(data)
 
 
-@hook.event(EventType.message, EventType.action, singlethread=True)
+@hook.event([EventType.message, EventType.action], singlethread=True)
 def chat_tracker(event, db, conn):
     """
     :type db: sqlalchemy.orm.Session