diff --git a/.travis.yml b/.travis.yml
index 89fbbfd..9ceffa1 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,16 +10,15 @@ env:
 
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-  - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
-  - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
-
-# omitting "script:" will default to phpunit
-# use the $DB env variable to determine the phpunit.xml to use
-script: 
+#  - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
+#  - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
+#  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev
-  - phpunit --configuration test/phpunit.xml --coverage-text
+  
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+script: phpunit --configuration test/phpunit.xml --coverage-text
 
 # configure notifications (email, IRC, campfire etc)
 notifications:
diff --git a/composer.json b/composer.json
index 69a55e8..15c1477 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "makesites/kisscms",
     "type": "library",
     "description": "Content Management made Simple",
-    "keywords": ["cms","kiss","free"],
+    "keywords": ["kisscms","cms","os","free"],
     "homepage": "http://kisscms.com",
     "license": "MIT",
     "authors": [
@@ -24,5 +24,8 @@
             "type": "vcs",
             "url": "http://github.com/makesites/kisscms"
         }
-    ]
+    ],
+    "autoload": {
+        "psr-0": {"KISSCMS": "./"}
+    }
 }
\ No newline at end of file