Add default templates
Add automatic default for template dir path
Add support for templates
Update docs
Merge branch 'master' of github.com:davesque/s

Conflicts:
	README.md