updated Marionette section with latest info and simplified component discussion
Merge pull request #380 from derickbailey/gh-pages

Update Marionette section