Merge pull request #7 from miry/multiple_config_files

Load settings from the multiple files depends on current env
updated version
added additional test directories
updated version
Additional test tasks no longer running separately from default
Merge pull request #8 from tmwh/master

Additional test tasks no longer running separately from default