Moved "or" to login/signup boxes
Hide or when there is a social match
Bump BB commit to test saucelab / travis changes
Add sauceclient==0.1.0 to ci requirements
Merge pull request #1387 from FransTwisk/Moved-"or"-to-login/signup-boxes

Moved "or" to login/signup boxes
Merge remote-tracking branch 'origin/develop' into feature/user-flow-tests

Conflicts:
	requirements/ci_requirements.txt
Merge branch 'feature/user-flow-tests' of github.com:onepercentclub/onepercentclub-site into feature/user-flow-tests