Cleaned up the dependencies
Added some more Travis-CI builds