Merge pull request #284 from fetch/test-require-fix

Using __DIR__ in require_once, to fix travis errors
Added option for multiple model directories
Conventions
updated docblocks
Added tests