Add a bunch of new stuff
Merge branch 'master' of https://github.com/matthewfleming/snippets