addressing comment on 7cf5d77, added shorter more reliable timeout (couldn't easily remove it)
Merge branch '0.9' of https://github.com/balderdashy/sails into 0.9
Merge pull request #449 from Zolmeister/0.9

0.9 bugfix