Change message sent when a template doesn't exist.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/octonore/template.rb