Fixes #25. Add fallback options to get_option for sites that are passing...

... null through.

@tlovett1 #reviewmerge