Merge pull request #7 from kohenkatz/master

Add other Mailcatcher configuration options
Merge pull request #8 from kohenkatz/master

fix mistake in template code