update smarty and yaml
Merge branch 'master' of github.com:matt-h/matth.co

Conflicts:
	composer.json