Added ability to specify spec directory when running tests.
Merge remote-tracking branch 'origin/feature/extend-support' into feature/extend-support-subweave
Use the naive subweave implementation until this is further along.