Merge branch 'ssh2-identifier'
Cleaned up whitespace
Merge pull request #250 from GrahamCampbell/whitespace-fixes

Cleaned Up Whitespace

* GrahamCampbell/whitespace-fixes:
  Cleaned up whitespace
Merge branch 'master' into php5

* master:
  Cleaned up whitespace

Conflicts:
	composer.json