Resolve snippet substition errors
Add testing snippets to group
Add while snippet, fix for snippet spacing
Refactor to use require-package; general cleanups