Another refactor
Merge branch 'master' of https://github.com/matthewfleming/snippets
Add list detection