Switched to PSR-4 autoloader.
Merge branch 'master' of https://github.com/ericpoe/schrodinger

Conflicts:
	composer.json