Merge pull request #1 from bancer/master

Wikipedia integration
Merge pull request #2 from bancer/master

pull request
Merge pull request #3 from bancer/master

Home page improvements
Merge pull request #3 from kapparulz/master

pull request