Merge branch 'NewCombinator' of git@github.com:winteryoung/Sprache.git into NewCombinator

Conflicts:
	src/Sprache/Input.cs
Merge branch 'NewCombinator' of git@github.com:winteryoung/Sprache.git into NewCombinator

Conflicts:
	src/Sprache/Input.cs
Manually fix merge problems.