Some more changes from Bill.
Merge branch 'master' of https://github.com/Make-Magazine/makercon
Merge branch 'develop'
Merge branch 'develop'