Pointing 'npm test' to 'grunt test' so Travis will do things.
Trigger Region close event with view that's being closed
Merge pull request #820 from seansfkelley/add-test-package-json

Pointing 'npm test' to 'grunt test' so Travis will do things.
- Remove reference to dev branch from contrib doc

The dev branch does not appear to be the correct branch to work against anymore. Removed section of contributing.md that indicates that is the correct practice.
Merge pull request #836 from andrewhubbs/patch-1

Remove reference to dev branch from contrib doc
Accept function as default `options` for Views

Fixes an issue where Marionette would not respect a function that returned
an object as the `options` field of a View.
fix upgrade guide for latest version
Call the `itemViewContainer` with the current context.

Add tests for calling `itemViewContainer` in context of composite view.

Call the `itemViewContainer` with the current context.
Merge pull request #834 from cobbweb/trigger-region-close-event-with-view

Trigger Region close event with view that's being closed
Merge pull request #841 from TheCloudlessSky/itemViewContainer-context

Call the itemViewContainer in the context of the CompositeView
Update bower_components folder ignore
Merge pull request #819 from seansfkelley/options-as-fn

Don't ignore default options in the view constructor when it's a function.
Remove TextMate-specific config

We don't want editor specific files bloating our repo, there's better
generic alternatives like EditorConfig
Add EditorConfig file

This is a generic configuration file that can be used by many editors.
See http://editorconfig.org/ for more information.
Merge pull request #850 from cobbweb/editorconfig

Add EditorConfig file
Fix collectionView reset buffer itemView show condition

When a collectionView was rendered and then reset, the itemView had
show called while it was still in the dom fragment.
Thus invalidating show and onDomRefresh

fixes #843
Merge pull request #849 from marionettejs/sjs/843-collection-reset-bug

Fix collectionView reset buffer itemView show condition
onDomRefresh should only trigger if the view.el is actually in the DOM
Trim trailing whitespace
EditorConfig settings should only target JavaScript files

We don't want to trim whitespace in markdown, etc.