Clean up and document
Merge branch 'master' of github.com:dabbler0/wigo