Moved test into test dir
Merge branch 'bookish-only' into epub-only
Moved epub test into test dir
Moved test and config files out of main directory
Moved test and config files out of main directory
Merged from dev
removed merg conflict code