Cleanup
Merge pull request #57 from wajam/manu-continuous-feeder-persist

Continuous feeder persistence cleanup