Made test/bootstrap.php composer-friendly
Merge branch 'master' of github.com:rdlowrey/Arya