Merge pull request #52 from roaet/basic_runtime_override_support

Old waffles updated for runtime overrides

Removed the 'derp' log