working toward consistent spacing and code style
resolved merge conflict in recorder.js
restructured javascript assets to conform with app/assets & vendor/assets conventions.
cleaned up spacing in controllers, added flash notice when user can't delete self
resolved trivial merge conflict in collab controller
collaborators view fix