cleanup options
Fix up basic auth madness
Add spec for authorization

Not happy with this yet, needs more love.