Fix the Composer autoloader

#96

This should likely be applied to the 2 and 3 branches.