Merge pull request #4 from peholmst/master

Update master from upstream/master
Update README with Sidebar & i18n extension
Merge pull request #116 from GJRTimmer/stuff-update

Stuff update