Merge branch 'feature/cleanup' into develop
Merge branch 'feature/cleanup' into develop
Puts comment.id in commented, not the entire comment.
send_message - small optimizations
Adds term_history dicts and setters
moves building of message into it's own func, build_message
Merge branch 'master' into develop
Merge branch 'develop' into feature/dictionaries
Merge branch 'master' into feature/dictionaries

Conflicts:
	asoiaf-reddit.py
Merge branch 'master' into feature/dictionaries
Resolved conflicts

Conflicts:
	asoiaf-reddit.py
Merge pull request #3 from shidarin/feature/dictionaries

Feature/dictionaries