Improvements

Options no longer a singleton
Create temporary files for Option tests
Make Ditto::Entity a class
Refactoring