Added the ability to use Travis CI

Minor bug fixes