updating generators
reordering generators
Merge branch 'master' of github.com:lachlanp/acts_as_mailable