TW username regex, readme updated and some other improvements
wikipedia merging