Merge pull request #61 from Mause/master

Further style updates
Rewrote storage api to be a subclass of dict
Modified plusplus plugin to account for modifications to Storage api
Small refactor
Merge pull request #62 from Mause/storage-dict

Storage API now subclass of dict, further refactoring.
Merge branch 'master' into storage-tests