Remove excludes, fix broken scald.rb and whitespace issue