Cleanup

- Try to cleanup tmp builder/ring files if we encounter an error
- Cleanup sample configs to match defaults
Bump version