updates for phantomjs
 adding default option for use_js
update for js
Merge branch 'master' into GALAXY-915_js_prototype
GALAXY-915 - Merged 915 cobweb with master, updated the Gemfile.lock