Merge remote-tracking branch 'remotes/origin/string-formatting'

Conflicts:
	awehamster.py
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	awehamster.py
Escape curly brackets passed in as formatting & use default option when no current activity
Escaping additional formatting strings
Merge pull request #5 from robinmalburn/master

Escape Formatting Strings