Merge options with defaults. Really merge. Duh.
Merge branch 'master' of https://github.com/ozh/ozh-tweet-archiver