Merge branch 'develop'

Conflicts:
	plugins/tell.py
Merge branch 'master' into python3.4

Conflicts:
	modules/cookie.py
	modules/tell.py
	plugins/tell.py