Merge pull request #561 from timfel/fix-settings-test-maglev

MagLev doesn't #expand __FILE__ like it should

test/settings_test.rb

@@ -446,7 +446,7 @@ class SettingsTest < Test::Unit::TestCase
     end
 
     it 'defaults to the file subclassing' do
-      assert_equal __FILE__, Sinatra.new.app_file
+      assert_equal File.expand_path(__FILE__), Sinatra.new.app_file
     end
   end