added tests for multiple proprietor
Added config for tests.

Re organised requirements a bit.

install test requirements on travis.
Merge from master
Merge branch 'test-multiple-proprietors'