re write storage objects to include wordcount

[citylims]

should have written the storage code to handle this from the start. DOH!

[citylims]

This is hooked up. There are some bugs and the accuracy of the word matching isn't as stable as before.
Time to write some tests