Merge branch 'v1.1.0' of github.com:katalyst/koi into v1.1.0
Removed unecessary code from mailer generator
Merge branch 'v1.1.0'
Merge branch 'master' of github.com:katalyst/koi