Add implicit defaults to DEFAULTS
Remove short-circuits from Site
Merge pull request #962 from dracula2000/refactor-site

Move defaults found in site.rb to DEFAULTS Hash