Functional test fixes and some refactoring

- refactor settings files for testing
- refactor tests a little to use selenium waits rather than sleep
- bump BB version
- cleanup the travis and testing settings file