edits
Merge branch 'gh-pages' of github.com:spacedman/barry into gh-pages