Remove some ugly h2
Fix tabs
Move tabs script
Update readme
Merge remote-tracking branch 'upstream/master'