Clean up invalid intermediates logic.
Merge branch 'lbradstreet' of github.com:MichaelDrogalis/onyx into lbradstreet
Check that lifecycle methods return a map #19