Bill's updates
Merge branch 'master' of https://github.com/Make-Magazine/makercon