fixes for travisci, composer.lock added back in

Author: cbschuld

.gitignore

@@ -2,4 +2,3 @@
 vendor
 .phpunit.result.cache
 /phpunit.xml
-/composer.lock

.travis.yml

@@ -9,4 +9,7 @@ php:
   - 5.5
   - 5.4
 
+install: composer install
+
 script: phpunit --configuration phpunit.xml.dist
+

composer.json

@@ -19,7 +19,7 @@
         "classmap": ["lib/Browser.php"]
     },
     "require": {
-        "php": "^5.4"
+        "php": ">=5.4"
     },
     "extra": {
         "branch-alias": {