align graph & reindent
Merge branch 'master' into gh-pages