more notes...
Merge branch 'master' of github.com:gregcaporaso/cloaked-octo-ninja