Feature/scalding lzo

Rebased feature/scalding_lzo off of develop to help facilitate a clean merge.