New content and 80 column limit
Remove undeveloped material from right effort
Merge branch 'master' into gh-pages