Merge branch 'gist'

This combines the MIT license chosen when instantiating the repository
with the changes from the gist repo so we can preserve the history