increased timeout
upgraded rails to 4.0.2