Merge pull request #257 from iampersistent/develop

update composer with alias and update travis to include 5.5

.travis.yml

 language: php
 
 phps:
+  - 5.5
   - 5.4
   - 5.3
 

composer.json

@@ -19,6 +19,11 @@
         "phpunit/phpunit": "~3.7",
         "squizlabs/php_codesniffer": "~1.4"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "3.3.x-dev"
+        }
+    },
     "autoload": {
         "psr-0": { "Solarium\\": "library/" }
     }