Index: unk/app.psgi
===================================================================
--- /trunk/app.psgi	(revision 98)
+++ 	(revision )
@@ -1,7 +1,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-use BookmarksApp;
-
-#TODO: allow individual options to be set via environment vars, too
-BookmarksApp->new({ config_file => $ENV{CONFIG_FILE} })->to_app;
Index: /trunk/lib/BookmarksApp.pm
===================================================================
--- /trunk/lib/BookmarksApp.pm	(revision 98)
+++ /trunk/lib/BookmarksApp.pm	(revision 99)
@@ -5,5 +5,5 @@
 
 use parent qw{Plack::Component};
-use Plack::Util::Accessor qw{config_file config _app _controller};
+use Plack::Util::Accessor qw{config _app _controller};
 
 use YAML;
@@ -18,15 +18,4 @@
 
     my $config = $self->config;
-
-    # if the config_file is set, try to load the config from there
-    # note that currently, if there is a config_file and a config,
-    # all of the values in config are ignored in favor of those in
-    # the config_file
-    if ($self->config_file) {
-        -e $self->config_file or die "Config file " . $self->config_file . " not found\n";
-        $config = YAML::LoadFile($self->config_file);
-        #TODO: merge the configs instead of overwriting?
-        $self->config($config);
-    }
 
     my $router = router {