Template changes.
Merge branch 'master' of github.com:shnip-it/shnip.it