Merge pull request #1 from pennyfx/tests

added jasmine and few lifecycle event tests
removed under utilized merge functionality
removed under utilized merge functionality
defaulting lifecycle to an object on register parse
fixed conflict