Merge remote-tracking branch 'zach/master'
updated readme.md
fixed edge case where comments or weird line breaks in parameter list could screw things up
implemented lifecycles
updated test app
updated README.md
updated readme some more
renamed resolve to inject
minor