Merge pull request #2 from cfwheels/new-master

keeping upstream up to date
repair test controller.miscellaneous.sendmail fails on Railo #229
Merge pull request #3 from scahyono/upstream

merge from Upstream