clean up
remove inchinadict
fix gfwlist.txt parse problem
merge