Add integration test for --timeout
Add support for --ui and -U
Add documentation for --ui and -U options
Add --timeout to usage and make options documentation more consistent
Bump phantomjs to ~0.8.0
Add support for custom phantomjs install path with --phantomjs
Document --phantomjs
Add JP Richardson to contributors
0.10.0
Merge from upstream
Merge from upstream