use forthcoming wd geolocation methods
remove deprecated --merciful and --device-port flags
add --force-quit-instruments flag instead
and fix grunt docs to add the jekyll preamble and write to the correct path
Merge pull request #2330 from jlipps/jlipps-1.0-beta

remove deprecated server args