updates
Merge branch 'master' of github.com:filbertkm/wikibot

Conflicts:
	.gitignore