Merging moteus suggestions for rockspec and travis