Merge pull request #17 from google/dgreiman/b12

Extend import_roots to also automatically include workspace roots.