Removed unused imports
changed the logging style in the project to be same everywhere
fixed some merge conflicts
Resolving merge conflicts
Merge branch 'next_storage' into unused_imports
Merge pull request #64 from hi3g/logger_fix

changed the logging style in the project to be same everywhere
Merge pull request #65 from hi3g/unused_imports

Unused imports
Moved tests but did not implement them. That will happen in a seperate pull request. Some of the structure is implemented in the memory store because I started in the "wrong" end.
minor chnages
Merge pull request #67 from hi3g/test_branch

Moved tests but did not implement them. That will happen in a seperate p...
managed merge conflicts