Added the ability to merge props into a model.
fixed bug with mailer templates
Merge branch 'master' of github.com:mediaslave/phrails