General work

modified:   Gemfile.lock
	-- updated capistrano

deleted:    app/assets/javascripts/angular/controllers/annotate.js
	-- uneeded

modified:   app/assets/stylesheets/application.css.scss
	-- fixed missing bottstrap directory css

modified:   app/assets/javascripts/angular/controllers/listen.js
modified:   app/assets/templates/listen.html
	-- added support for the audio element having multiple audio sources

modified:   app/controllers/media_controller.rb
	-- prepended "."'s to the avaailable formats strings in order to be consistent with the default formats

modified:   lib/RestFailureApp.rb
	-- Fixed bad JSON output - handcrafted string had single quotes in it
resolved merge conflict - kept mark's