Implement multiple source directories

* bump version
* add 'fromDirs' to specify multiple directories
* 'from' now adds, rather than replaces
* new tests