Updated composer.json

Switched to PSR-4 and updated dev-master alias