Alias the php5 branch as 2.0.x for now
Update sami/sami to 2.*
Update phpunit/phpunit to 4.3.*
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Merge pull request #516 from bantu/dev-deps-update

Update development dependencies

* bantu/dev-deps-update:
  Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
  Update phpunit/phpunit to 4.3.*
  Update sami/sami to 2.*
Merge branch 'master' into php5

* master:
  Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
  Update phpunit/phpunit to 4.3.*
  Update sami/sami to 2.*

Conflicts:
	composer.lock
Merge pull request #515 from GrahamCampbell/patch-1

Alias the php5 branch as 2.0.x for now

* GrahamCampbell/patch-1:
  Alias the php5 branch as 2.0.x for now