collaborator backboned
backboned part II
Merge remote-tracking branch 'keir/master'

Conflicts:
	public/js/backbone.js
	public/js/collaborator.js
	public/js/underscore.js
	views/index.erb
	views/layout.erb