merging old gitignore with new one
updating travis ci image link