From eb5991ccd0686d15615bff3a730a641889063943 Mon Sep 17 00:00:00 2001
From: David Barratt <david@davidwbarratt.com>
Date: Mon, 18 Feb 2013 18:04:45 -0500
Subject: Revert all changes to see if travis just doesn't like me.

---
 .travis.yml   | 3 ++-
 composer.json | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b2f6bd57..070b23c8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ env:
   - DB=pdo/sqlite
 
 before_script:
-  - composer install --dev
+  - curl -s http://getcomposer.org/installer | php
+  - php composer.phar install
   - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
diff --git a/composer.json b/composer.json
index e21aaed2e..7d60020c3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,8 @@
 {
-    "name" : "ellislab/codeigniter",
     "require": {
-        "php": ">=5.2.4"
+        "mikey179/vfsStream": "*"
     },
     "require-dev": {
-      "mikey179/vfsStream": "*"
-		}
+		"phpunit/phpunit": "*"
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b