Added vendor directory to git ignore
Merge branch 'airtime'