Merge pull request #230 from scahyono/upstream

repair test controller.miscellaneous.sendmail fails on Railo #229
Merge pull request #5 from cfwheels/new-master

pull from upstream
expand path only if necessary
Merge pull request #6 from scahyono/bugfix

Bugfix