Cleanup
Bump copyright year
Leftover from b30f74c37912f87f44588bbecf9d3fcfe38797f4
Update fixture
Whitespace fixes
Merge pull request #14 from GrahamCampbell/fixes

Whitespace Fixes
Update MergeCommand.php
Merge pull request #16 from hnesk/master

Merge command doesn't merge
Merge remote-tracking branch 'upstream/master' into transform-command

Conflicts:
	src/autoload.php