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

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

Conflicts:
	src/Sprache/Input.cs