Merge branch 'master' of git://github.com/brunch/brunch into upstream
fixing conventions so that folders within the project (not at the top level) with a name of "components" doesn't get treated differently.
Merge pull request #591 from bolster/upstream

Fixing Vendor and Asset Conventions