Merge branch 'configobj'

diff --cc mediagoblin/tests/test_celery_setup.py
index 2a7601c7a52d8247629c0ce48ff7f484bba1a4aa,8bf97ae4b68d18099e6a32121e98695fad351476..33c50e40475e40a33f2fe6bc2d8e4e575c609ffe
--- 1/mediagoblin/tests/test_celery_setup.py
--- 2/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@@ -14,7 -14,16 +14,14 @@@
  # You should have received a copy of the GNU Affero General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -import pkg_resources
 -
  from mediagoblin import celery_setup
+ from mediagoblin.config import read_mediagoblin_config
+ 
+ 
+ TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename(
+     'mediagoblin.tests', 'fake_celery_conf.ini')
+ TEST_CELERY_CONF_MGSPECIALDB = pkg_resources.resource_filename(
+     'mediagoblin.tests', 'fake_celery_conf_mgdb.ini')
  
  
  def test_setup_celery_from_config():