Prepare travis configuration
Merge branch 'master' of github.com:alexmt/plus2flickr