Initial stab at consolidation
Cleanup and centralize librato uploader