May fixes

I've submitted quite a few pull requests, but I figured that it would be easier for you if I just submit one with all the fixes.

The commit message are pretty clear, and I've updated the relevant documentation. I think I fixed some pretty significant issues, including fixing the integration tests which have been failing.

I also adding Travis-CI support - so if you merge this, please enable Travis CI on this repository.