Update snippets with new additions and some bug fixes
Merge branch 'master' of github.com:pungerfreak/html-email