Changed autoloader handling, minor tweaks to unstick Travis.
Merge pull request #5 from simensen/autoloader-and-tweaks

Changed autoloader handling, minor tweaks to unstick Travis.