Merge pull request #373 from wardi/master

duplicate extras workaround 1 of 2, dataset form bug fix for extra orgs
Merge pull request #374 from wardi/master

Fix test broken dependencies, new org creation
travis: separate install from test run