add cache: bundler
Merge branch 'feature/travis-ci' into feature/people_edit
fix acceptance test
Merge branch 'feature/people_edit' into feature/org_edit