updated gitignore
Changed travis conf