Refactor options to be a function.

This will return a new object and there is no need to clone the object
using underscore.

This also sets us up to put in HAWK Creds with a default user.