cleaning up and fixing errors, but passenger is still not working correctly with saphire
Merge branch 'master' of https://github.com/Joern/Saphire

Conflicts:
	README.md