Add Travis support
Merge branch 'production' into staging