Missed some changes
Merge branch 'trying_to_get_travis_working' into staging