formatting changes
cominbe tags and branches section
move tags section up
Merge branch 'master' into gh-pages
updating html