refactored a persistence system out of the datastore and made DataStore a concrete class.  removed old DatabaseDataStore and FlatFileDatastore implementations.  created a quick and dirty Yaml based persistence.
merged upstream changes
formatting & javadocs
whitespace
datastore actually works now
Custom Flags!