Adding travis to .gitignore for multi-fork configs
Merge branch 'master' into openstackIdentity