fixed a few typos and things
Merge branch 'master' of https://github.com/shilad/wikapidia into upstream-master