tidy up routes
beginning media api tidy
Merge branch 'master' into media_api_refactor
Get gem updates from master
added media response class
added media response content class
updated gems - baw-audio-tools fix and twitter-bootstrap changes
updated gems
updated gems
Updated media api to match new format. Haven't finished updating tests.
fixing uncaught errors display; adding tests for errors
improved tests
updated baw-audio-tools; still working on getting passing tests
improved tests for exceptions
more improvements to tests for exceptions
Merge branch 'media_api_refactor' into develop

Conflicts:
	Gemfile.lock
	app/models/settings.rb