Fixed missing composer.lock conflict resolution; Update travis config file: added php 5.6

Signed-off-by: Tom Van Herreweghe <[email protected]>

Author: Tom Van Herreweghe

.travis.yml

@@ -4,10 +4,11 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 matrix:
   allow_failures:
-    - php: 5.5
+    - php: 5.6
 
 script:
   - mkdir -p build/logs
@@ -16,7 +17,7 @@ script:
   - ./vendor/bin/phpcs --standard=PSR2 ./lib/
 
 before_script:
-  - composer install --dev --prefer-source
+  - composer install --prefer-source
 
 after_script:
   - php vendor/bin/coveralls -v