Update origin master

pulled from crawljax/crawljax. just sending updates to master here. perhaps unneeded.