Getting ready for travis-ci