more concise naming of sinks and stores, order config file settings in a clearer order
Merge remote-tracking branch 'upstream/master'
pep8 fix
Merge pull request #300 from stevendgonzales/master

clarify namimg between stores and sinks, reorder of config file values to group like settings together