Minor cleanup
Composer, convert to PHPUnit
Working on #19 and #20
Unit tests, minor bugfixes