roll back first attempt to deal with cert generation taking too long, replace with extra retries and add cmdline flag in case someone has a much slower system
Merge pull request #281 from SvenDowideit/increase-retries-and-add-flags

Deal with cert generation taking too long, re...