Tell travis not to run on the staging branch
Merge branch 'staging' of github.com:compasschurch/cbcoverseas.org into staging