added file storage
derp
Merge remote-tracking branch 'lusitanian/master'

* lusitanian/master:
  derp
  added file storage
Fix formatting of previous merge
Test that ArrayStorage returns null by default
More tests, cover edge cases, fix some faulty FileStorage behaviour