Merge branch 'develop' of github.com:gsnorton/Capsulator into develop