Made no-ff look nice in graph
Merge branch 'master' into gh-pages