updates for Travis
Merge branch 'master' of https://github.com/adamthede/airbnb-light

hopefully nothing in here will conflict