updates for phantomjs
 adding default option for use_js
update for js
updating cobweb to use cookiejar stuff
updating typhoeus version
Making the sitemap code use the same request code as the rest of cobweb.
Fixing issues with sitemap and ssl retrieval issues
Merge branch 'master' into GALAXY-915_js_prototype
GALAXY-915 - Merged 915 cobweb with master, updated the Gemfile.lock
fixes for base_url not registering correctly
updating sitemaps to look in the base_url/sitemap.xml
GALAXY-1139 - Resolve conflict merging with master