Oops, fix factoids list
Merge branch 'develop'

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