added vendor folder for travis ci
Merge origin/master