big fix for module inclusion
Merge branch 'master' of github.com:jeyboy/email_template

Conflicts:
	lib/email-template/version.rb