Fixes all over the place
Add travis builds
Merge pull request #2 from bipthelin/bt-fixes

Fixes all over the place