removed weechat log file from repo
Updated TODO
re-added crunchbang statement to python script
Merge remote-tracking branch 'origin'

Conflicts:
	TODO