Merge from develop to master

This fixes grabbing the error level while logging the output.
@ehealy 
cc: @Tapjoy/opsautomation