Merge in Paul Molluzzo updates

@paulmolluzzo did some work to fix URLs and params (yaaay!). Passing it along to the repo reflected in atmosphere.