Update to new brunch and chaplin.
Finish up stuff.
Desc.
Merge branch 'master' of github.com:chaplinjs/basic-example

Conflicts:
	app/controllers/users-controller.coffee