Merge branch 'master' of github.com:bgrace/glugglug